From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 01/10] drm/i915: don't save/restore DSPARB on gen5+ Date: Thu, 24 Jan 2013 11:26:13 +0200 Message-ID: <87622nue2y.fsf@intel.com> References: <1358540953-3979-1-git-send-email-przanoni@gmail.com> <1358540953-3979-2-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E485E65C1 for ; Thu, 24 Jan 2013 01:24:58 -0800 (PST) In-Reply-To: <1358540953-3979-2-git-send-email-przanoni@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Paulo Zanoni , intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Fri, 18 Jan 2013, Paulo Zanoni wrote: > From: Paulo Zanoni > > Because the register does not exist in gen5+. > > This patch solves "unclaimed register" messages on Haswell after > suspend/resume. Reviewed-by: Jani Nikula > > Signed-off-by: Paulo Zanoni > --- > drivers/gpu/drm/i915/i915_suspend.c | 6 ++++-- > 1 file 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) */ > -- > 1.7.10.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx