From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: Re: [PATCH 1/2] drm/i915: Collect gtier properly on HSW. Date: Fri, 1 Aug 2014 14:58:12 -0300 Message-ID: References: <1406884417-9905-1-git-send-email-rodrigo.vivi@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ob0-f178.google.com (mail-ob0-f178.google.com [209.85.214.178]) by gabe.freedesktop.org (Postfix) with ESMTP id 347976E2E2 for ; Fri, 1 Aug 2014 10:58:14 -0700 (PDT) Received: by mail-ob0-f178.google.com with SMTP id nu7so2872657obb.37 for ; Fri, 01 Aug 2014 10:58:12 -0700 (PDT) In-Reply-To: <1406884417-9905-1-git-send-email-rodrigo.vivi@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Rodrigo Vivi Cc: Intel Graphics Development , Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org 2014-08-01 6:13 GMT-03:00 Rodrigo Vivi : > GTIER and DEIER doesn't have same interface on HSW so this "or" operation > makes the information provided useless. > > v2: since we have gtier variable already let's split for everybody > and avoid the strange | op. > Also avoid overriding the value that was set for vlv. In this case I > believe that we should reorganize the whole function, but I'll respect > the comment that ask to not touch the order and let this organization > work to be done later. > > Cc: Paulo Zanoni > Signed-off-by: Rodrigo Vivi > --- > drivers/gpu/drm/i915/i915_drv.h | 1 + > drivers/gpu/drm/i915/i915_gpu_error.c | 24 ++++++++++++++---------- > 2 files changed, 15 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index d604f4f..60227b2 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -317,6 +317,7 @@ struct drm_i915_error_state { > u32 eir; > u32 pgtbl_er; > u32 ier; > + u32 gtier; > u32 ccid; > u32 derrmr; > u32 forcewake; > diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c > index 0b3f694..76c67dd 100644 > --- a/drivers/gpu/drm/i915/i915_gpu_error.c > +++ b/drivers/gpu/drm/i915/i915_gpu_error.c > @@ -359,6 +359,8 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, > err_printf(m, "PCI ID: 0x%04x\n", dev->pdev->device); > err_printf(m, "EIR: 0x%08x\n", error->eir); > err_printf(m, "IER: 0x%08x\n", error->ier); > + if (HAS_PCH_SPLIT(dev) || IS_VALLEYVIEW(dev)) > + err_printf(m, "GTIER: 0x%08x\n", error->gtier); Optional bikeshed: you could just check for Gen >= 5 here. > err_printf(m, "PGTBL_ER: 0x%08x\n", error->pgtbl_er); > err_printf(m, "FORCEWAKE: 0x%08x\n", error->forcewake); > err_printf(m, "DERRMR: 0x%08x\n", error->derrmr); > @@ -1102,7 +1104,8 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, > > /* 1: Registers specific to a single generation */ > if (IS_VALLEYVIEW(dev)) { > - error->ier = I915_READ(GTIER) | I915_READ(VLV_IER); > + error->gtier = I915_READ(GTIER); > + error->ier = I915_READ(VLV_IER); > error->forcewake = I915_READ(FORCEWAKE_VLV); > } > > @@ -1135,17 +1138,18 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, > if (HAS_HW_CONTEXTS(dev)) > error->ccid = I915_READ(CCID); > > - if (HAS_PCH_SPLIT(dev)) > - error->ier = I915_READ(DEIER) | I915_READ(GTIER); > - else { > - if (IS_GEN2(dev)) > - error->ier = I915_READ16(IER); > - else > - error->ier = I915_READ(IER); > + if (HAS_PCH_SPLIT(dev)) { > + error->ier = I915_READ(DEIER); > + error->gtier = I915_READ(GTIER); > + } else if (IS_GEN2(dev)) { > + error->ier = I915_READ16(IER); > + } else { > + error->ier = I915_READ(IER); We're still overwriting VLV's IER here. > } > > - /* 4: Everything else */ > - error->eir = I915_READ(EIR); > + /* do not override what was set above for VLV */ > + if (!IS_VALLEYVIEW(dev)) > + error->eir = I915_READ(EIR); I don't see EIR being set above on VLV. It was IER, not EIR. > error->pgtbl_er = I915_READ(PGTBL_ER); > > i915_get_extra_instdone(dev, error->extra_instdone); > -- > 1.9.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Paulo Zanoni