diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-11-16 06:43:21 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-11-21 11:45:02 -0500 |
commit | b92fa839015f27ba0f5c7ef9812eba9ecff538c2 (patch) | |
tree | 148442f65878fc5c29bc23f1ea4834957d503cc2 | |
parent | d09105c66eb813ab3f57ba5e738f477f6ff92dec (diff) |
drm/i915: Remove save/restore of physical HWS_PGA register
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>
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index dfb63fb48e24..b25df10b0b5c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -402,7 +402,6 @@ struct i915_suspend_saved_registers { | |||
402 | u32 saveDSPACNTR; | 402 | u32 saveDSPACNTR; |
403 | u32 saveDSPBCNTR; | 403 | u32 saveDSPBCNTR; |
404 | u32 saveDSPARB; | 404 | u32 saveDSPARB; |
405 | u32 saveHWS; | ||
406 | u32 savePIPEACONF; | 405 | u32 savePIPEACONF; |
407 | u32 savePIPEBCONF; | 406 | u32 savePIPEBCONF; |
408 | u32 savePIPEASRC; | 407 | u32 savePIPEASRC; |
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index a818eba7cb66..63d4d30c39de 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c | |||
@@ -811,10 +811,6 @@ int i915_save_state(struct drm_device *dev) | |||
811 | 811 | ||
812 | mutex_lock(&dev->struct_mutex); | 812 | mutex_lock(&dev->struct_mutex); |
813 | 813 | ||
814 | /* Hardware status page */ | ||
815 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | ||
816 | dev_priv->regfile.saveHWS = I915_READ(HWS_PGA); | ||
817 | |||
818 | i915_save_display(dev); | 814 | i915_save_display(dev); |
819 | 815 | ||
820 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) { | 816 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) { |
@@ -865,10 +861,6 @@ int i915_restore_state(struct drm_device *dev) | |||
865 | 861 | ||
866 | mutex_lock(&dev->struct_mutex); | 862 | mutex_lock(&dev->struct_mutex); |
867 | 863 | ||
868 | /* Hardware status page */ | ||
869 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | ||
870 | I915_WRITE(HWS_PGA, dev_priv->regfile.saveHWS); | ||
871 | |||
872 | i915_restore_display(dev); | 864 | i915_restore_display(dev); |
873 | 865 | ||
874 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) { | 866 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) { |