diff options
| author | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2013-01-18 18:29:03 -0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-01-24 16:58:06 +0100 |
| commit | 8de0add7231f5747f192c1ed35fd792a866c885b (patch) | |
| tree | 7c769c383541d75594b5d37fd8b4a56d5540e2fa /drivers/gpu/drm/i915/i915_suspend.c | |
| parent | c00db2463978ffab59d731773aae1a4f4e11d78c (diff) | |
| download | op-kernel-dev-8de0add7231f5747f192c1ed35fd792a866c885b.zip op-kernel-dev-8de0add7231f5747f192c1ed35fd792a866c885b.tar.gz | |
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: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_suspend.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 63d4d30..95c0582 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -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 */ @@ -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) */ |
