From patchwork Fri Oct 31 15:38:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mika Kuoppala X-Patchwork-Id: 5205441 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1FFB6C11AC for ; Fri, 31 Oct 2014 15:37:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3DE262013A for ; Fri, 31 Oct 2014 15:37:33 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 3BDA320120 for ; Fri, 31 Oct 2014 15:37:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65FFB89EA3; Fri, 31 Oct 2014 08:37:31 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id EA5DD89F03 for ; Fri, 31 Oct 2014 08:37:29 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 31 Oct 2014 08:36:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="409153475" Received: from rosetta.fi.intel.com (HELO rosetta) ([10.237.72.83]) by FMSMGA003.fm.intel.com with ESMTP; 31 Oct 2014 08:27:51 -0700 Received: by rosetta (Postfix, from userid 1000) id 4B04680052; Fri, 31 Oct 2014 17:38:33 +0200 (EET) From: Mika Kuoppala To: intel-gfx@lists.freedesktop.org Date: Fri, 31 Oct 2014 17:38:31 +0200 Message-Id: <1414769911-13761-1-git-send-email-mika.kuoppala@intel.com> X-Mailer: git-send-email 1.9.1 Cc: miku@iki.fi Subject: [Intel-gfx] [PATCH] drm/i915: Pass vmas to i915_error_object_create 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.8 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 to move the interface to the ppgtt era. Signed-off-by: Mika Kuoppala --- drivers/gpu/drm/i915/i915_gpu_error.c | 49 +++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c index d17360b..a3e62f00 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -561,16 +561,20 @@ static void i915_error_state_free(struct kref *error_ref) static struct drm_i915_error_object * i915_error_object_create(struct drm_i915_private *dev_priv, - struct drm_i915_gem_object *src, - struct i915_address_space *vm) + struct i915_vma *vma) { struct drm_i915_error_object *dst; - struct i915_vma *vma = NULL; + struct drm_i915_gem_object *src; int num_pages; bool use_ggtt; int i = 0; u32 reloc_offset; + if (WARN_ON(vma == NULL)) + return NULL; + + src = vma->obj; + if (src == NULL || src->pages == NULL) return NULL; @@ -580,23 +584,21 @@ i915_error_object_create(struct drm_i915_private *dev_priv, if (dst == NULL) return NULL; - if (i915_gem_obj_bound(src, vm)) - dst->gtt_offset = i915_gem_obj_offset(src, vm); + if (i915_gem_obj_bound(src, vma->vm)) + dst->gtt_offset = i915_gem_obj_offset(src, vma->vm); else dst->gtt_offset = -1; reloc_offset = dst->gtt_offset; - if (i915_is_ggtt(vm)) - vma = i915_gem_obj_to_ggtt(src); use_ggtt = (src->cache_level == I915_CACHE_NONE && - vma && (vma->bound & GLOBAL_BIND) && - reloc_offset + num_pages * PAGE_SIZE <= dev_priv->gtt.mappable_end); + (vma->bound & GLOBAL_BIND) && + reloc_offset + num_pages * PAGE_SIZE <= dev_priv->gtt.mappable_end); /* Cannot access stolen address directly, try to use the aperture */ if (src->stolen) { use_ggtt = true; - if (!(vma && vma->bound & GLOBAL_BIND)) + if (!(vma->bound & GLOBAL_BIND)) goto unwind; reloc_offset = i915_gem_obj_ggtt_offset(src); @@ -658,13 +660,16 @@ unwind: kfree(dst); return NULL; } -#define i915_error_ggtt_object_create(dev_priv, src) \ - i915_error_object_create((dev_priv), (src), &(dev_priv)->gtt.base) static void capture_bo(struct drm_i915_error_buffer *err, struct i915_vma *vma) { - struct drm_i915_gem_object *obj = vma->obj; + struct drm_i915_gem_object *obj; + + if (WARN_ON(vma == NULL)) + return; + + obj = vma->obj; err->size = obj->base.size; err->name = obj->base.name; @@ -808,8 +813,7 @@ static void gen8_record_semaphore_state(struct drm_i915_private *dev_priv, if (!error->semaphore_obj) error->semaphore_obj = i915_error_object_create(dev_priv, - dev_priv->semaphore_obj, - &dev_priv->gtt.base); + i915_gem_obj_to_ggtt(dev_priv->semaphore_obj)); for_each_ring(to, dev_priv, i) { int idx; @@ -965,7 +969,7 @@ static void i915_gem_record_active_context(struct intel_engine_cs *ring, continue; if ((error->ccid & PAGE_MASK) == i915_gem_obj_ggtt_offset(obj)) { - ering->ctx = i915_error_ggtt_object_create(dev_priv, obj); + ering->ctx = i915_error_object_create(dev_priv, i915_gem_obj_to_ggtt(obj)); break; } } @@ -1005,13 +1009,12 @@ static void i915_gem_record_rings(struct drm_device *dev, */ error->ring[i].batchbuffer = i915_error_object_create(dev_priv, - request->batch_obj, - vm); + i915_gem_obj_to_vma(request->batch_obj, vm)); if (HAS_BROKEN_CS_TLB(dev_priv->dev)) error->ring[i].wa_batchbuffer = - i915_error_ggtt_object_create(dev_priv, - ring->scratch.obj); + i915_error_object_create(dev_priv, + i915_gem_obj_to_ggtt(ring->scratch.obj)); if (request->file_priv) { struct task_struct *task; @@ -1044,10 +1047,12 @@ static void i915_gem_record_rings(struct drm_device *dev, error->ring[i].cpu_ring_tail = rbuf->tail; error->ring[i].ringbuffer = - i915_error_ggtt_object_create(dev_priv, rbuf->obj); + i915_error_object_create(dev_priv, + i915_gem_obj_to_ggtt(rbuf->obj)); error->ring[i].hws_page = - i915_error_ggtt_object_create(dev_priv, ring->status_page.obj); + i915_error_object_create(dev_priv, + i915_gem_obj_to_ggtt(ring->status_page.obj)); i915_gem_record_active_context(ring, error, &error->ring[i]);