From: Ben Widawsky Subject: [PATCH 2/2] drm/i915: catch gtfifo errors on forcewake_put Date: Fri, 3 Feb 2012 14:31:41 -0800 Message-ID: <1328308301-28304-2-git-send-email-ben@bwidawsk.net> References: <1328308301-28304-1-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from cloud01.chad-versace.us (184-106-247-128.static.cloud-ips.com [184.106.247.128]) by gabe.freedesktop.org (Postfix) with ESMTP id C6D409E768 for ; Fri, 3 Feb 2012 14:32:43 -0800 (PST) In-Reply-To: <1328308301-28304-1-git-send-email-ben@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: intel-gfx@lists.freedesktop.org Cc: Ben Widawsky List-Id: intel-gfx@lists.freedesktop.org This is similar to a patch I wrote several months ago. It's been updated for the new FORCEWAKE_MT, and it also no longer clears the debug register as it may be helpful to get that for the error state. Also recommended by Chris Wilson, use WARN() instead of DRM_ERROR, so we can get a backtrace. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 1658cfd..3f88ca8 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -381,12 +381,18 @@ void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv) void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv) { + u32 gtfifodbg = I915_READ(GTFIFODBG); + WARN(gtfifodbg & GT_FIFO_CPU_ERROR_MASK, + "MMIO read or write has been dropped %x\n", gtfifodbg); I915_WRITE_NOTRACE(FORCEWAKE, 0); POSTING_READ(FORCEWAKE); } void __gen6_gt_force_wake_mt_put(struct drm_i915_private *dev_priv) { + u32 gtfifodbg = I915_READ(GTFIFODBG); + WARN(gtfifodbg & GT_FIFO_CPU_ERROR_MASK, + "MMIO read or write has been dropped %x\n", gtfifodbg); I915_WRITE_NOTRACE(FORCEWAKE_MT, (1<<16) | 0); POSTING_READ(FORCEWAKE_MT); } -- 1.7.9