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

Commit 461cba2d authored by Peng Li's avatar Peng Li Committed by Dave Airlie
Browse files

drm/i915: Save/restore HWS_PGA on suspend/resume 



It fixes suspend/resume failure of xf86-video-intel dri2
branch. As dri2 branch doesn't call I830DRIResume() to restore
hardware status page anymore, we need to preserve
this register across suspend/resume.

Signed-off-by: default avatarPeng Li <peng.li@intel.com>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 52440211

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ typedef struct drm_i915_private { 
	u32 saveDSPBCNTR;

	u32 saveDSPARB;

	u32 saveRENDERSTANDBY;

	u32 saveHWS;

	u32 savePIPEACONF;

	u32 savePIPEBCONF;

	u32 savePIPEASRC;

drivers/gpu/drm/i915/i915_suspend.c

+6 −0
Original line number Diff line number Diff line
@@ -244,6 +244,9 @@ int i915_save_state(struct drm_device *dev) 
	if (IS_I965G(dev) && IS_MOBILE(dev))

		dev_priv->saveRENDERSTANDBY = I915_READ(MCHBAR_RENDER_STANDBY);



	/* Hardware status page */

	dev_priv->saveHWS = I915_READ(HWS_PGA);



	/* Display arbitration control */

	dev_priv->saveDSPARB = I915_READ(DSPARB);
@@ -373,6 +376,9 @@ int i915_restore_state(struct drm_device *dev) 
	if (IS_I965G(dev) && IS_MOBILE(dev))

		I915_WRITE(MCHBAR_RENDER_STANDBY, dev_priv->saveRENDERSTANDBY);



	/* Hardware status page */

	I915_WRITE(HWS_PGA, dev_priv->saveHWS);



	/* Display arbitration */

	I915_WRITE(DSPARB, dev_priv->saveDSPARB);