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

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
...@@ -620,7 +620,8 @@ static void i915_save_display(struct drm_device *dev) ...@@ -620,7 +620,8 @@ static void i915_save_display(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
/* Display arbitration control */ /* Display arbitration control */
dev_priv->regfile.saveDSPARB = I915_READ(DSPARB); if (INTEL_INFO(dev)->gen <= 4)
dev_priv->regfile.saveDSPARB = I915_READ(DSPARB);
/* This is only meaningful in non-KMS mode */ /* This is only meaningful in non-KMS mode */
/* Don't regfile.save them in KMS mode */ /* Don't regfile.save them in KMS mode */
...@@ -707,7 +708,8 @@ static void i915_restore_display(struct drm_device *dev) ...@@ -707,7 +708,8 @@ static void i915_restore_display(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
/* Display arbitration */ /* Display arbitration */
I915_WRITE(DSPARB, dev_priv->regfile.saveDSPARB); if (INTEL_INFO(dev)->gen <= 4)
I915_WRITE(DSPARB, dev_priv->regfile.saveDSPARB);
if (!drm_core_check_feature(dev, DRIVER_MODESET)) { if (!drm_core_check_feature(dev, DRIVER_MODESET)) {
/* Display port ratios (must be done before clock is set) */ /* Display port ratios (must be done before clock is set) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment