From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH 05/15] drm/i915: capture the correct cursor registers on IVB Date: Thu, 7 Mar 2013 11:34:08 +0200 Message-ID: <20130307093408.GR4469@intel.com> References: <1362611003-4823-1-git-send-email-przanoni@gmail.com> <1362611003-4823-6-git-send-email-przanoni@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 7562EE6AEE for ; Thu, 7 Mar 2013 01:34:18 -0800 (PST) Content-Disposition: inline In-Reply-To: <1362611003-4823-6-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 Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Wed, Mar 06, 2013 at 08:03:12PM -0300, Paulo Zanoni wrote: > From: Paulo Zanoni > = > This solves some "unclaimed register" messages when there's a GPU hang > on Haswell. > = > Signed-off-by: Paulo Zanoni > --- > drivers/gpu/drm/i915/intel_display.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > = > diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/= intel_display.c > index 9a9f6d7..789a95a 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -9336,9 +9336,15 @@ intel_display_capture_error_state(struct drm_devic= e *dev) > for_each_pipe(i) { > cpu_transcoder =3D intel_pipe_to_cpu_transcoder(dev_priv, i); > = > - error->cursor[i].control =3D I915_READ(CURCNTR(i)); > - error->cursor[i].position =3D I915_READ(CURPOS(i)); > - error->cursor[i].base =3D I915_READ(CURBASE(i)); > + if (INTEL_INFO(dev)->gen <=3D 6) { > + error->cursor[i].control =3D I915_READ(CURCNTR(i)); > + error->cursor[i].position =3D I915_READ(CURPOS(i)); > + error->cursor[i].base =3D I915_READ(CURBASE(i)); > + } else { > + error->cursor[i].control =3D I915_READ(CURCNTR_IVB(i)); > + error->cursor[i].position =3D I915_READ(CURPOS_IVB(i)); > + error->cursor[i].base =3D I915_READ(CURBASE_IVB(i)); > + } Needs a VLV check. > = > error->plane[i].control =3D I915_READ(DSPCNTR(i)); > error->plane[i].stride =3D I915_READ(DSPSTRIDE(i)); > -- = > 1.7.10.4 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC