Commit 8de0add7 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: don't save/restore DSPARB on gen5+ 



Because the register does not exist in gen5+.

This patch solves "unclaimed register" messages on Haswell after
suspend/resume.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c00db246

drivers/gpu/drm/i915/i915_suspend.c

+4 −2
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ static void i915_save_display(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;



	/* Display arbitration control */

	if (INTEL_INFO(dev)->gen <= 4)

		dev_priv->regfile.saveDSPARB = I915_READ(DSPARB);



	/* This is only meaningful in non-KMS mode */
@@ -707,6 +708,7 @@ static void i915_restore_display(struct drm_device *dev) 
	struct drm_i915_private *dev_priv = dev->dev_private;



	/* Display arbitration */

	if (INTEL_INFO(dev)->gen <= 4)

		I915_WRITE(DSPARB, dev_priv->regfile.saveDSPARB);



	if (!drm_core_check_feature(dev, DRIVER_MODESET)) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE