From patchwork Wed Feb 10 15:50:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: arun.siluvery@linux.intel.com X-Patchwork-Id: 8272951 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2FE8CBEEE5 for ; Wed, 10 Feb 2016 15:50:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B0C2203E3 for ; Wed, 10 Feb 2016 15:50:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 40BDA2039E for ; Wed, 10 Feb 2016 15:50:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 79AE56E71B; Wed, 10 Feb 2016 07:50:25 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E0306E71B for ; Wed, 10 Feb 2016 07:50:24 -0800 (PST) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP; 10 Feb 2016 07:50:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,426,1449561600"; d="scan'208";a="45646750" Received: from asiluver-linux.isw.intel.com ([10.102.226.117]) by fmsmga004.fm.intel.com with ESMTP; 10 Feb 2016 07:50:23 -0800 From: Arun Siluvery To: intel-gfx@lists.freedesktop.org Date: Wed, 10 Feb 2016 15:50:07 +0000 Message-Id: <1455119410-17283-7-git-send-email-arun.siluvery@linux.intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455119410-17283-1-git-send-email-arun.siluvery@linux.intel.com> References: <1455119410-17283-1-git-send-email-arun.siluvery@linux.intel.com> Cc: Mika Kuoppala Subject: [Intel-gfx] [PATCH v2 6/9] drm/i915/error: enhanced error capture of requests 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-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dave Gordon Record a few more things about the requests outstanding at the time of capture ... For: VIZ-2021 Signed-off-by: Dave Gordon Signed-off-by: Arun Siluvery --- drivers/gpu/drm/i915/i915_drv.h | 6 +++++- drivers/gpu/drm/i915/i915_gpu_error.c | 23 +++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 549478f..ed991bf 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -564,8 +564,9 @@ struct drm_i915_error_state { u64 ctx_desc; struct drm_i915_error_object { - int page_count; u64 gtt_offset; + bool is_ppgtt; + int page_count; u32 *pages[0]; } *req_ringbuffer, *hw_ringbuffer, *batchbuffer, *wa_batchbuffer, *ctx, *hws_page; @@ -573,7 +574,10 @@ struct drm_i915_error_state { u64 ctx_desc; long jiffies; u32 seqno; + u32 head; u32 tail; + u32 submission_count; + u64 ringbuffer_gtt; } *requests; struct { diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index c599df6..03485ca 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -493,9 +493,11 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, err_printf(m, " (submitted by %s [%d])", error->ring[i].comm, error->ring[i].pid); - err_printf(m, " --- gtt_offset = 0x%08x %08x\n", + err_printf(m, " --- %sgtt_offset = 0x%08x %08x; %d pages\n", + obj->is_ppgtt ? "pp" : "g", upper_32_bits(obj->gtt_offset), - lower_32_bits(obj->gtt_offset)); + lower_32_bits(obj->gtt_offset), + obj->page_count); print_error_obj(m, obj); } @@ -514,9 +516,13 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, for (j = 0; j < error->ring[i].num_requests; j++) { struct drm_i915_error_request *erq; erq = &error->ring[i].requests[j]; - err_printf(m, " seqno 0x%08x, tail 0x%08x, " - "emitted %ld, ctx_desc 0x%08x_%08x\n", - erq->seqno, erq->tail, erq->jiffies, + err_printf(m, " seqno 0x%08x, ringbuf 0x%llx " + "head 0x%08x tail 0x%08x, " + "emitted %ld, %d submissions, " + "ctx_desc 0x%08x_%08x\n", + erq->seqno, erq->ringbuffer_gtt, + erq->head, erq->tail, + erq->jiffies, erq->submission_count, upper_32_bits(erq->ctx_desc), lower_32_bits(erq->ctx_desc)); } @@ -698,6 +704,8 @@ i915_error_object_create(struct drm_i915_private *dev_priv, reloc_offset = dst->gtt_offset; if (i915_is_ggtt(vm)) vma = i915_gem_obj_to_ggtt(src); + else + dst->is_ppgtt = true; use_ggtt = (src->cache_level == I915_CACHE_NONE && vma && (vma->bound & GLOBAL_BIND) && reloc_offset + num_pages * PAGE_SIZE <= dev_priv->gtt.mappable_end); @@ -1209,7 +1217,10 @@ static void i915_gem_record_rings(struct drm_device *dev, erq->ctx_desc = intel_lr_context_descriptor(ctx, ring); erq->jiffies = request->emitted_jiffies; erq->seqno = request->seqno; - erq->tail = request->postfix; + erq->tail = request->tail; + erq->head = request->head; + erq->submission_count = request->elsp_submitted; + erq->ringbuffer_gtt = i915_gem_obj_ggtt_offset(request->ringbuf->obj); } } }