From patchwork Mon Oct 3 12:52:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9360557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 66761607D6 for ; Mon, 3 Oct 2016 12:53:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 58118289DD for ; Mon, 3 Oct 2016 12:53:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CE95289E6; Mon, 3 Oct 2016 12:53:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 093C5289DD for ; Mon, 3 Oct 2016 12:53:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 677676E40C; Mon, 3 Oct 2016 12:53:07 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1C6E86E40C for ; Mon, 3 Oct 2016 12:53:05 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id f193so9975539wmg.2 for ; Mon, 03 Oct 2016 05:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=JEzWFnAy+Ro9wHgXUoh7i7AVS9kw8B8Ev9xso1mKbX8=; b=w7000zvymylU53rLp0HaF3OHPptqNhGPsO47pg+R716X5hiRWiPWYglgoH1xB0Lxd9 /HMpHH/IvlI0VxYjlmhTUKC2j1odsbRbWD9xxwJSj4AKyFDnVhey5w1xd6Gi8dgtO75T f1x5Po5IYQqm6LescWdrsxLGRH5THAApWapG/obRoBScZUVzWQzz+d19qCIRVOY84K7Q RcJff+wR6YqpJ++AJ1KldjUu5BY0+Hp8TIxt3ZOcbEj1+YD+pWQp0glf+dXnFdQwVwyd hsZU8OZsRMmW0Xd105VzpZzoM412mwlAyBLp4MAMcIgUcjCxnTu7ZIHn5gznk7/cl7vH drkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=JEzWFnAy+Ro9wHgXUoh7i7AVS9kw8B8Ev9xso1mKbX8=; b=EVWCISfKq20XOmKnt9PWveFF6NnG3aMioNr4JVjzFkU9qedjAvOqhAfUvf8btsGV7+ wb+GqaB9COylCjI8tbehIIV1nG1Ipme/G/3COh9xwM821OokW13LySSc9sTwk26TOV+4 CxhMnMtB6158tv+smJCp3s5QM3yQ/zaVepzDeibU4ZiFAxH7IbtpBgT2ZbYGsoqXXB7V c5bp3dkbvvYDiJTUAgJLDDaWGE7GethAs+bp0Tv9CdGQWKx9E6lz3tUs5r2LSXRpMIy3 7kx9MPjNmFc6tyc2EjsbZMKrqnvN28wCZviZPHCwNXf8xwQebb+XpasZmruVF2FVqjGw /0Gg== X-Gm-Message-State: AA6/9Rk+PA+zkhbeUDNgGYXXr+g9t6pOmSiid0Gca0+c8zYRnP11roGGrFiJwYcaGi2sHQ== X-Received: by 10.194.250.106 with SMTP id zb10mr16130100wjc.99.1475499183461; Mon, 03 Oct 2016 05:53:03 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id r1sm11931833wjc.43.2016.10.03.05.53.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Oct 2016 05:53:02 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Mon, 3 Oct 2016 13:52:44 +0100 Message-Id: <20161003125246.17686-6-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161003125246.17686-1-chris@chris-wilson.co.uk> References: <20161003125246.17686-1-chris@chris-wilson.co.uk> Cc: Mika Kuoppala Subject: [Intel-gfx] [PATCH 6/8] drm/i915: Show bounds of active request in the ring on GPU hang X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Include the position of the active request in the ring, and display that alongside the current RING registers (on a GPU hang). Signed-off-by: Chris Wilson Cc: Mika Kuoppala Reviewed-by: Mika Kuoppala --- drivers/gpu/drm/i915/i915_drv.h | 3 +++ drivers/gpu/drm/i915/i915_gpu_error.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 91ac283d733e..e48044b3a447 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -776,6 +776,9 @@ struct drm_i915_error_state { struct i915_address_space *vm; int num_requests; + /* position of active request inside the ring */ + u32 rq_head, rq_post, rq_tail; + /* our own tracking of ring head and tail */ u32 cpu_ring_head; u32 cpu_ring_tail; diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index 2bbab226a46c..8b85efbdfa04 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -262,8 +262,9 @@ static void error_print_engine(struct drm_i915_error_state_buf *m, { err_printf(m, "%s command stream:\n", engine_str(ee->engine_id)); err_printf(m, " START: 0x%08x\n", ee->start); - err_printf(m, " HEAD: 0x%08x\n", ee->head); - err_printf(m, " TAIL: 0x%08x\n", ee->tail); + err_printf(m, " HEAD: 0x%08x\n [0x%08x]", ee->head, ee->rq_head); + err_printf(m, " TAIL: 0x%08x [0x%08x, 0x%08x]\n", + ee->tail, ee->rq_post, ee->rq_tail); err_printf(m, " CTL: 0x%08x\n", ee->ctl); err_printf(m, " MODE: 0x%08x\n", ee->mode); err_printf(m, " HWS: 0x%08x\n", ee->hws); @@ -1230,6 +1231,10 @@ static void i915_gem_record_rings(struct drm_i915_private *dev_priv, error->simulated |= request->ctx->flags & CONTEXT_NO_ERROR_CAPTURE; + ee->rq_head = request->head; + ee->rq_post = request->postfix; + ee->rq_tail = request->tail; + ring = request->ring; ee->cpu_ring_head = ring->head; ee->cpu_ring_tail = ring->tail;