diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2011-03-02 00:52:37 -0500 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-02 06:26:13 -0500 |
commit | a7a75c8f70d6f6a2f16c9f627f938bbee2d32718 (patch) | |
tree | ded64174c8231b9ae080e63a74b62476810c104f /drivers/gpu | |
parent | 4cbf74ccf8362e99b2bdf1e66112a480c79ecacf (diff) |
drm/i915: Don't save/restore hardware status page address register
It's cleaned before saving and re-initialized after restoring.
So don't need to save/restore it. And also new chip has new address
for hardware status page register, don't write to old address.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index fd41b86864e9..9f3650c9882a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -383,7 +383,6 @@ typedef struct drm_i915_private { | |||
383 | u32 saveDSPACNTR; | 383 | u32 saveDSPACNTR; |
384 | u32 saveDSPBCNTR; | 384 | u32 saveDSPBCNTR; |
385 | u32 saveDSPARB; | 385 | u32 saveDSPARB; |
386 | u32 saveHWS; | ||
387 | u32 savePIPEACONF; | 386 | u32 savePIPEACONF; |
388 | u32 savePIPEBCONF; | 387 | u32 savePIPEBCONF; |
389 | u32 savePIPEASRC; | 388 | u32 savePIPEASRC; |
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index da474153a0a2..7e992a8e9098 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c | |||
@@ -796,9 +796,6 @@ int i915_save_state(struct drm_device *dev) | |||
796 | 796 | ||
797 | pci_read_config_byte(dev->pdev, LBB, &dev_priv->saveLBB); | 797 | pci_read_config_byte(dev->pdev, LBB, &dev_priv->saveLBB); |
798 | 798 | ||
799 | /* Hardware status page */ | ||
800 | dev_priv->saveHWS = I915_READ(HWS_PGA); | ||
801 | |||
802 | i915_save_display(dev); | 799 | i915_save_display(dev); |
803 | 800 | ||
804 | /* Interrupt state */ | 801 | /* Interrupt state */ |
@@ -845,9 +842,6 @@ int i915_restore_state(struct drm_device *dev) | |||
845 | 842 | ||
846 | pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB); | 843 | pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB); |
847 | 844 | ||
848 | /* Hardware status page */ | ||
849 | I915_WRITE(HWS_PGA, dev_priv->saveHWS); | ||
850 | |||
851 | i915_restore_display(dev); | 845 | i915_restore_display(dev); |
852 | 846 | ||
853 | /* Interrupt state */ | 847 | /* Interrupt state */ |