Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b92fa839 authored by Chris Wilson's avatar Chris Wilson Committed by Daniel Vetter
Browse files

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: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent d09105c6

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -402,7 +402,6 @@ struct i915_suspend_saved_registers { 
	u32 saveDSPACNTR;

	u32 saveDSPBCNTR;

	u32 saveDSPARB;

	u32 saveHWS;

	u32 savePIPEACONF;

	u32 savePIPEBCONF;

	u32 savePIPEASRC;

drivers/gpu/drm/i915/i915_suspend.c

+0 −8
Original line number Diff line number Diff line
@@ -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)) {
@@ -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)) {