From: Jesse Barnes Subject: Re: [PATCH 5/8] drm/i915: save/restore MI_ARB_STATE only for gen3 Date: Mon, 21 Mar 2011 10:43:50 -0700 Message-ID: <20110321104350.087e6985@jbarnes-desktop> References: <1300699639-23996-1-git-send-email-zhenyuw@linux.intel.com> <1300699639-23996-6-git-send-email-zhenyuw@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy1-pub.bluehost.com (oproxy1-pub.bluehost.com [66.147.249.253]) by gabe.freedesktop.org (Postfix) with SMTP id 2A5D99E9B1 for ; Mon, 21 Mar 2011 10:43:53 -0700 (PDT) In-Reply-To: <1300699639-23996-6-git-send-email-zhenyuw@linux.intel.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: Zhenyu Wang Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, 21 Mar 2011 17:27:16 +0800 Zhenyu Wang wrote: > Signed-off-by: Zhenyu Wang > --- > 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 11e61a3..26387c3 100644 > --- a/drivers/gpu/drm/i915/i915_suspend.c > +++ b/drivers/gpu/drm/i915/i915_suspend.c > @@ -820,7 +820,8 @@ int i915_save_state(struct drm_device *dev) > gen6_disable_rps(dev); > > /* Memory Arbitration state */ > - dev_priv->saveMI_ARB_STATE = I915_READ(MI_ARB_STATE); > + if (IS_GEN3(dev)) > + dev_priv->saveMI_ARB_STATE = I915_READ(MI_ARB_STATE); > > /* Scratch space */ > for (i = 0; i < 16; i++) { > @@ -865,7 +866,8 @@ int i915_restore_state(struct drm_device *dev) > gen6_enable_rps(dev_priv); > > /* Memory arbitration state */ > - I915_WRITE (MI_ARB_STATE, dev_priv->saveMI_ARB_STATE | 0xffff0000); > + if (IS_GEN3(dev)) > + I915_WRITE (MI_ARB_STATE, dev_priv->saveMI_ARB_STATE | 0xffff0000); > > for (i = 0; i < 16; i++) { > I915_WRITE(SWF00 + (i << 2), dev_priv->saveSWF0[i]); This register exists on gen4 as well, though as with CACHE_MODE_0, we should probably be setting it to a good value rather than simply trusting the BIOS. -- Jesse Barnes, Intel Open Source Technology Center