Skip to content

Commit

Permalink
drm/i915: don't save/restore DSPARB on gen5+
Browse files Browse the repository at this point in the history
Because the register does not exist in gen5+.

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

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed Jan 24, 2013
1 parent c00db24 commit 8de0add
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/i915/i915_suspend.c
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,8 @@ static void i915_save_display(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;

/* 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 */
/* Don't regfile.save them in KMS mode */
Expand Down Expand Up @@ -707,7 +708,8 @@ static void i915_restore_display(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private;

/* 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)) {
/* Display port ratios (must be done before clock is set) */
Expand Down

0 comments on commit 8de0add

Please sign in to comment.