From patchwork Wed May 7 05:21:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Widawsky X-Patchwork-Id: 4125611 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 24293C0ACC for ; Wed, 7 May 2014 05:21:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D581E20165 for ; Wed, 7 May 2014 05:21:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D7DF42018B for ; Wed, 7 May 2014 05:21:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3CBBB6EC1C; Tue, 6 May 2014 22:21:44 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 7E0C76EC1C for ; Tue, 6 May 2014 22:21:42 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga101.ch.intel.com with ESMTP; 06 May 2014 22:21:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="4.97,1001,1389772800"; d="scan'208"; a="527541103" Received: from unknown (HELO ironside.intel.com) ([10.255.12.78]) by fmsmga001.fm.intel.com with ESMTP; 06 May 2014 22:21:41 -0700 From: Ben Widawsky To: Intel GFX Date: Tue, 6 May 2014 22:21:34 -0700 Message-Id: <1399440098-17378-5-git-send-email-benjamin.widawsky@intel.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1399440098-17378-1-git-send-email-benjamin.widawsky@intel.com> References: <1399440098-17378-1-git-send-email-benjamin.widawsky@intel.com> Cc: Ben Widawsky , Ben Widawsky Subject: [Intel-gfx] [PATCH 5/9] drm/i915: Use new drm node allocator for PPGTT X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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 The two users were already really similar. By adding the flags (I hope you like a lot of arguments in your functions), we can satisfy both callers quite well. Signed-off-by: Ben Widawsky --- drivers/gpu/drm/i915/i915_drv.h | 16 ++++++++++++++++ drivers/gpu/drm/i915/i915_gem.c | 34 +++++++++++++++++----------------- drivers/gpu/drm/i915/i915_gem_gtt.c | 24 +++++++----------------- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 5f4f631..c1d2bea 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -2069,6 +2069,22 @@ void i915_init_vm(struct drm_i915_private *dev_priv, void i915_gem_free_object(struct drm_gem_object *obj); void i915_gem_vma_destroy(struct i915_vma *vma); +#define MAX_VMA_FIND_RETRY 100 +int i915_gem_find_vm_space_generic(struct i915_address_space *vm, + struct drm_mm_node *node, + unsigned long size, + unsigned long align, + unsigned long color, + unsigned long start, + unsigned long end, + uint32_t flags, + enum drm_mm_search_flags sflags, + enum drm_mm_allocator_flags aflags, + uint8_t retry); +#define i915_gem_find_vm_space(vm, node, size, align, color, start, end, flags, retry) \ + i915_gem_find_vm_space_generic(vm, node, size, align, color, \ + start, end, flags, DRM_MM_BOTTOMUP, retry) + #define PIN_MAPPABLE 0x1 #define PIN_NONBLOCK 0x2 #define PIN_GLOBAL 0x4 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index de98b26..e9599e9 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -3216,24 +3216,23 @@ static void i915_gem_verify_gtt(struct drm_device *dev) #endif } -#define MAX_VMA_FIND_RETRY 100 -static int -i915_gem_find_vm_space(struct i915_address_space *vm, - struct drm_mm_node *node, - unsigned long size, - unsigned long align, - unsigned long color, - unsigned long start, - unsigned long end, - uint32_t flags, - uint8_t retry) +int i915_gem_find_vm_space_generic(struct i915_address_space *vm, + struct drm_mm_node *node, + unsigned long size, + unsigned long align, + unsigned long color, + unsigned long start, + unsigned long end, + uint32_t flags, + enum drm_mm_search_flags sflags, + enum drm_mm_allocator_flags aflags, + uint8_t retry) { int ret; ret = drm_mm_insert_node_in_range_generic(&vm->mm, node, size, align, color, start, end, - DRM_MM_SEARCH_DEFAULT, - DRM_MM_CREATE_DEFAULT); + sflags, aflags); if (ret && (retry < MAX_VMA_FIND_RETRY)) { if (WARN_ON(ret != -ENOSPC)) return ret; @@ -3241,10 +3240,11 @@ i915_gem_find_vm_space(struct i915_address_space *vm, ret = i915_gem_evict_something(vm->dev, vm, size, align, color, flags); if (ret == 0) - return i915_gem_find_vm_space(vm, node, - size, align, color, - start, end, flags, - retry++); + return i915_gem_find_vm_space_generic(vm, node, + size, align, color, + start, end, + sflags, aflags, flags, + retry++); } return ret; diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 66fcfc9..79ae83b 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -1022,7 +1022,6 @@ static int gen6_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt) { struct drm_device *dev = ppgtt->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; - bool retried = false; int ret; /* PPGTT PDEs reside in the GGTT and consists of 512 entries. The @@ -1030,22 +1029,13 @@ static int gen6_ppgtt_allocate_page_directories(struct i915_hw_ppgtt *ppgtt) * size. We allocate at the top of the GTT to avoid fragmentation. */ BUG_ON(!drm_mm_initialized(&dev_priv->gtt.base.mm)); -alloc: - ret = drm_mm_insert_node_in_range_generic(&dev_priv->gtt.base.mm, - &ppgtt->node, GEN6_PD_SIZE, - GEN6_PD_ALIGN, 0, - 0, dev_priv->gtt.base.total, - DRM_MM_TOPDOWN); - if (ret == -ENOSPC && !retried) { - ret = i915_gem_evict_something(dev, &dev_priv->gtt.base, - GEN6_PD_SIZE, GEN6_PD_ALIGN, - I915_CACHE_NONE, 0); - if (ret) - return ret; - - retried = true; - goto alloc; - } + ret = i915_gem_find_vm_space_generic(&dev_priv->gtt.base, &ppgtt->node, + GEN6_PD_SIZE, GEN6_PD_ALIGN, 0, + 0, dev_priv->gtt.base.total, + DRM_MM_TOPDOWN, 0, + MAX_VMA_FIND_RETRY-1); + if (ret) + return ret; if (ppgtt->node.start < dev_priv->gtt.mappable_end) DRM_DEBUG("Forced to use aperture for PDEs\n");