Skip to content

Commit

Permalink
drm/i915: Remove save/restore of physical HWS_PGA register
Browse files Browse the repository at this point in the history 
Now that we always restore the HWS registers (both physical and GTT
virtual addresses) when re-initialising the rings, we can eliminate the
superfluous save/restore of the register across suspend and resume.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Nov 21, 2012
1 parent d09105c commit b92fa83
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
1 change: 0 additions & 1 deletion drivers/gpu/drm/i915/i915_drv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,6 @@ struct i915_suspend_saved_registers {
u32 saveDSPACNTR;
u32 saveDSPBCNTR;
u32 saveDSPARB;
u32 saveHWS;
u32 savePIPEACONF;
u32 savePIPEBCONF;
u32 savePIPEASRC;
Expand Down
8 changes: 0 additions & 8 deletions drivers/gpu/drm/i915/i915_suspend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -811,10 +811,6 @@ int i915_save_state(struct drm_device *dev)

mutex_lock(&dev->struct_mutex);

/* Hardware status page */
if (!drm_core_check_feature(dev, DRIVER_MODESET))
dev_priv->regfile.saveHWS = I915_READ(HWS_PGA);

i915_save_display(dev);

if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
Expand Down Expand Up @@ -865,10 +861,6 @@ int i915_restore_state(struct drm_device *dev)

mutex_lock(&dev->struct_mutex);

/* Hardware status page */
if (!drm_core_check_feature(dev, DRIVER_MODESET))
I915_WRITE(HWS_PGA, dev_priv->regfile.saveHWS);

i915_restore_display(dev);

if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
Expand Down

0 comments on commit b92fa83

Please sign in to comment.