From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 05/15] drm/i915: capture the correct cursor registers on IVB Date: Sun, 17 Mar 2013 21:26:57 +0100 Message-ID: <20130317202657.GL9021@phenom.ffwll.local> References: <1362611003-4823-1-git-send-email-przanoni@gmail.com> <1362611003-4823-6-git-send-email-przanoni@gmail.com> <20130307093408.GR4469@intel.com> <20130315184546.GF17773@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ee0-f47.google.com (mail-ee0-f47.google.com [74.125.83.47]) by gabe.freedesktop.org (Postfix) with ESMTP id 8BB69E5EAA for ; Sun, 17 Mar 2013 13:24:12 -0700 (PDT) Received: by mail-ee0-f47.google.com with SMTP id e52so2283841eek.34 for ; Sun, 17 Mar 2013 13:24:11 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130315184546.GF17773@bwidawsk.net> 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: Ben Widawsky Cc: intel-gfx@lists.freedesktop.org, Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Fri, Mar 15, 2013 at 11:45:47AM -0700, Ben Widawsky wrote: > On Thu, Mar 07, 2013 at 11:34:08AM +0200, Ville Syrj=E4l=E4 wrote: > > 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/i= 915/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_d= evice *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. > = > Has anyone ever used this to actually debug an issue? > = > Ville's right, I suppose (I'm too lazy to find VLV docs). The non-VLV > part of the patch is: > Reviewed-by: Ben Widawsky Queued for -next with the IS_VLV check added, thanks for the patch. -Daniel -- = Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch