From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paulo Zanoni Subject: [PATCH 09/15] drm/i915: there's no PIPESTAT on Gen5+ Date: Wed, 6 Mar 2013 20:03:16 -0300 Message-ID: <1362611003-4823-10-git-send-email-przanoni@gmail.com> References: <1362611003-4823-1-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 mail-gg0-f169.google.com (mail-gg0-f169.google.com [209.85.161.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 78177E6481 for ; Wed, 6 Mar 2013 15:04:11 -0800 (PST) Received: by mail-gg0-f169.google.com with SMTP id j5so1322512ggn.14 for ; Wed, 06 Mar 2013 15:04:11 -0800 (PST) In-Reply-To: <1362611003-4823-1-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: intel-gfx@lists.freedesktop.org Cc: Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org From: Paulo Zanoni So don't read it when capturing the error state. This solves "unclaimed register" messages on Haswell when we have a GPU hang. Signed-off-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_irq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 2139714..29b1bb1 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -1366,8 +1366,9 @@ static void i915_capture_error_state(struct drm_device *dev) else if (INTEL_INFO(dev)->gen == 6) error->forcewake = I915_READ(FORCEWAKE); - for_each_pipe(pipe) - error->pipestat[pipe] = I915_READ(PIPESTAT(pipe)); + if (INTEL_INFO(dev)->gen <= 4) + for_each_pipe(pipe) + error->pipestat[pipe] = I915_READ(PIPESTAT(pipe)); if (INTEL_INFO(dev)->gen >= 6) { error->error = I915_READ(ERROR_GEN6); -- 1.7.10.4