From patchwork Mon May 4 14:44:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 6327191 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B79759F32B for ; Mon, 4 May 2015 14:44:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BE9A520320 for ; Mon, 4 May 2015 14:44:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B59E1202E6 for ; Mon, 4 May 2015 14:44:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 41E576E3E5; Mon, 4 May 2015 07:44:36 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F9B76E39E for ; Mon, 4 May 2015 07:44:34 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 04 May 2015 07:44:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,366,1427785200"; d="scan'208";a="689627088" Received: from rosetta.fi.intel.com (HELO rosetta) ([10.237.72.78]) by orsmga001.jf.intel.com with ESMTP; 04 May 2015 07:44:21 -0700 Received: by rosetta (Postfix, from userid 1000) id 4150280084; Mon, 4 May 2015 17:44:20 +0300 (EEST) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Mon, 4 May 2015 17:44:12 +0300 Message-Id: <1430750652-7931-2-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1430750652-7931-1-git-send-email-mika.kuoppala@intel.com> References: <1430750652-7931-1-git-send-email-mika.kuoppala@intel.com> Subject: [Intel-gfx] [PATCH 2/2] drm/i915: Record the object matching actual head to error state 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 If we have chained batch, the request only contains the batch buffer that branched the execution into chained batch. We can try to find object for actual head and if it is different than the object from request, record and print its state also. Signed-off-by: Mika Kuoppala Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com) --- drivers/gpu/drm/i915/i915_drv.h | 3 ++- drivers/gpu/drm/i915/i915_gpu_error.c | 49 ++++++++++++++++++++++++++++++++--- 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 136d42a..d23ca8e 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -480,7 +480,8 @@ struct drm_i915_error_state { int page_count; u32 gtt_offset; u32 *pages[0]; - } *ringbuffer, *batchbuffer, *wa_batchbuffer, *ctx, *hws_page; + } *ringbuffer, *batchbuffer, *wa_batchbuffer, + *active_batchbuffer, *ctx, *hws_page; struct drm_i915_error_request { long jiffies; diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index a3e330d..81705b9 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -433,6 +433,13 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m, print_error_obj(m, obj); } + obj = error->ring[i].active_batchbuffer; + if (obj) { + err_printf(m, "%s (active) --- gtt_offset = 0x%08x\n", + dev_priv->ring[i].name, obj->gtt_offset); + print_error_obj(m, obj); + } + if (error->ring[i].num_requests) { err_printf(m, "%s --- %d requests\n", dev_priv->ring[i].name, @@ -555,6 +562,7 @@ static void i915_error_state_free(struct kref *error_ref) for (i = 0; i < ARRAY_SIZE(error->ring); i++) { i915_error_object_free(error->ring[i].batchbuffer); i915_error_object_free(error->ring[i].wa_batchbuffer); + i915_error_object_free(error->ring[i].active_batchbuffer); i915_error_object_free(error->ring[i].ringbuffer); i915_error_object_free(error->ring[i].hws_page); i915_error_object_free(error->ring[i].ctx); @@ -596,13 +604,13 @@ i915_error_object_create(struct drm_i915_private *dev_priv, if (dst == NULL) return NULL; - if (i915_gem_obj_bound(src, vm)) + if (vm && i915_gem_obj_bound(src, vm)) dst->gtt_offset = i915_gem_obj_offset(src, vm); else dst->gtt_offset = -1; reloc_offset = dst->gtt_offset; - if (i915_is_ggtt(vm)) + if (vm && i915_is_ggtt(vm)) vma = i915_gem_obj_to_ggtt(src); use_ggtt = (src->cache_level == I915_CACHE_NONE && vma && (vma->bound & GLOBAL_BIND) && @@ -967,6 +975,27 @@ static void i915_gem_record_active_context(struct intel_engine_cs *ring, } } +static struct drm_i915_gem_object *find_obj_for_addr(struct drm_device *dev, + const u64 va_addr) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_i915_gem_object *obj; + struct i915_vma *vma; + + /* We are searching for chained batches, so we are happy + * for first match. + */ + list_for_each_entry(obj, &dev_priv->mm.bound_list, global_list) { + list_for_each_entry(vma, &obj->vma_list, vma_link) { + if (va_addr >= vma->node.start && + va_addr < vma->node.start + vma->node.size) + return obj; + } + } + + return NULL; +} + static void i915_gem_record_rings(struct drm_device *dev, struct drm_i915_error_state *error) { @@ -977,6 +1006,8 @@ static void i915_gem_record_rings(struct drm_device *dev, for (i = 0; i < I915_NUM_RINGS; i++) { struct intel_engine_cs *ring = &dev_priv->ring[i]; struct intel_ringbuffer *rbuf; + struct i915_address_space *vm = NULL; + struct drm_i915_gem_object *obj; error->ring[i].pid = -1; @@ -989,8 +1020,6 @@ static void i915_gem_record_rings(struct drm_device *dev, request = i915_gem_find_active_request(ring); if (request) { - struct i915_address_space *vm; - vm = request->ctx && request->ctx->ppgtt ? &request->ctx->ppgtt->base : &dev_priv->gtt.base; @@ -1022,6 +1051,18 @@ static void i915_gem_record_rings(struct drm_device *dev, } } + obj = find_obj_for_addr(dev, error->ring[i].acthd); + if (request && request->batch_obj == obj) + obj = NULL; + + if (obj) { + if (vm && !i915_gem_obj_bound(obj, vm)) + vm = NULL; + + error->ring[i].active_batchbuffer = + i915_error_object_create(dev_priv, obj, vm); + } + if (i915.enable_execlists) { /* TODO: This is only a small fix to keep basic error * capture working, but we need to add more information