From patchwork Mon Jul 16 18:51:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 1201721 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id 4D81440071 for ; Mon, 16 Jul 2012 18:57:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 348879EED8 for ; Mon, 16 Jul 2012 11:57:18 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org 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 A4D859EF03 for ; Mon, 16 Jul 2012 11:54:07 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by cloud01.chad-versace.us (Postfix) with ESMTP id D6D62180E61; Mon, 16 Jul 2012 18:56:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at static.cloud-ips.com X-Spam-Flag: NO X-Spam-Score: -2.9 X-Spam-Level: X-Spam-Status: No, score=-2.9 tagged_above=-100 required=3.5 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9] autolearn=ham Received: from cloud01.chad-versace.us ([127.0.0.1]) by localhost (cloud01.static.cloud-ips.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7aKJGaWeQxpT; Mon, 16 Jul 2012 18:56:44 +0000 (UTC) Received: from seagal.jf.intel.com (jfdmzpr02-ext.jf.intel.com [134.134.137.71]) by cloud01.chad-versace.us (Postfix) with ESMTPSA id 4ABD9181087; Mon, 16 Jul 2012 18:56:40 +0000 (UTC) From: Ben Widawsky To: intel-gfx@lists.freedesktop.org Date: Mon, 16 Jul 2012 11:51:59 -0700 Message-Id: <1342464719-8790-5-git-send-email-ben@bwidawsk.net> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1342464719-8790-1-git-send-email-ben@bwidawsk.net> References: <1342464719-8790-1-git-send-email-ben@bwidawsk.net> Cc: Ben Widawsky Subject: [Intel-gfx] [PATCH 4/4] drm/i915: Display the failing seqno X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org We'd really want to do a lot more here, but just as the demo for now. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_irq.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index a376371..864472ee 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -475,11 +475,17 @@ static void snb_gt_irq_handler(struct drm_device *dev, i915_handle_error(dev, false); } - if (gt_iir & (GT_GEN6_RENDER_TIMEOUT_COUNTER_EXPIRED)) - DRM_ERROR("Render timeout expired\n"); + if (gt_iir & (GT_GEN6_RENDER_TIMEOUT_COUNTER_EXPIRED)) { + u32 hung_seqno = intel_read_status_page(&dev_priv->ring[RCS], + I915_GEM_WATCHDOG_CRUMB_RCS); + DRM_ERROR("Render timeout expired (%u)\n", hung_seqno); + } - if (gt_iir & (GT_GEN6_BSD_TIMEOUT_COUNTER_EXPIRED)) - DRM_ERROR("BSD timeout expired\n"); + if (gt_iir & (GT_GEN6_BSD_TIMEOUT_COUNTER_EXPIRED)) { + u32 hung_seqno = intel_read_status_page(&dev_priv->ring[VCS], + I915_GEM_WATCHDOG_CRUMB_VCS); + DRM_ERROR("BSD timeout expired (%u)\n", hung_seqno); + } if (gt_iir & GT_GEN7_L3_PARITY_ERROR_INTERRUPT) ivybridge_handle_parity_error(dev);