From patchwork Thu May 7 09:47:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 6355041 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 5386DBEEE1 for ; Thu, 7 May 2015 09:48:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5BD8120351 for ; Thu, 7 May 2015 09:48:01 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C9FF520306 for ; Thu, 7 May 2015 09:47:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AD87C892FD; Thu, 7 May 2015 02:47:58 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from fireflyinternet.com (mail.fireflyinternet.com [87.106.93.118]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C52D892FD for ; Thu, 7 May 2015 02:47:57 -0700 (PDT) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from nuc-i3427.alporthouse.com (unverified [78.156.65.138]) by fireflyinternet.com (Firefly Internet (M1)) with ESMTP id 39625742-1500048 for multiple; Thu, 07 May 2015 10:48:14 +0100 Received: by nuc-i3427.alporthouse.com (sSMTP sendmail emulation); Thu, 07 May 2015 10:47:48 +0100 Date: Thu, 7 May 2015 10:47:48 +0100 From: Chris Wilson To: Daniel Vetter Message-ID: <20150507094748.GT22099@nuc-i3427.alporthouse.com> Mail-Followup-To: Chris Wilson , Daniel Vetter , Intel Graphics Development , Michel Thierry , Mika Kuoppala , Daniel Vetter References: <1430925481-11873-1-git-send-email-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1430925481-11873-1-git-send-email-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Daniel Vetter , Intel Graphics Development , Mika Kuoppala Subject: Re: [Intel-gfx] [PATCH] drm/i915: restore ggtt double-bind avoidance 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: , 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 On Wed, May 06, 2015 at 05:18:01PM +0200, Daniel Vetter wrote: > This was accidentally lost in > > commit 75d04a3773ecee617847de963ae4195d6aa74c28 > Author: Mika Kuoppala > Date: Tue Apr 28 17:56:17 2015 +0300 > > drm/i915/gtt: Allocate va range only if vma is not bound > > While at it implement an improved version suggested by Chris which > avoids the double-bind irrespective of what type of bind is done > first. > > Cc: Chris Wilson > Cc: Michel Thierry > Cc: Mika Kuoppala > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/i915_gem_gtt.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index 8fee6789fae2..11a3b511ae64 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -1928,6 +1928,9 @@ static int ggtt_bind_vma(struct i915_vma *vma, > cache_level, pte_flags); > } > > + if (!dev_priv->mm.aliasing_ppgtt) > + vma->bound |= GLOBAL_BIND | LOCAL_BIND; > + > return 0; > } Meh, it wasn't quite what I had in mind. If we do it there, we may as well go whole hog and do the vma->bound manipulation for both ggtt and ppgtt in the bind_vma() Something like: ickle@crystalwell:/usr/src/linux$ vim drivers/gpu/drm/i915/i915_gem_gtt.c ickle@crystalwell:/usr/src/linux$ git diff static int ppgtt_bind_vma(struct i915_vma *vma, enum i915_cache_level cache_level, - u32 unused) + u32 bind_flags) { u32 pte_flags = 0; @@ -159,6 +159,7 @@ static int ppgtt_bind_vma(struct i915_vma *vma, vma->vm->insert_entries(vma->vm, vma->obj->pages, vma->node.start, cache_level, pte_flags); + vma->bound |= bind_flags; return 0; } @@ -1956,6 +1957,7 @@ static int ggtt_bind_vma(struct i915_vma *vma, vma->vm->insert_entries(vma->vm, pages, vma->node.start, cache_level, pte_flags); + flags |= GLOBAL_BIND; } if (dev_priv->mm.aliasing_ppgtt && flags & LOCAL_BIND) { @@ -1965,6 +1967,7 @@ static int ggtt_bind_vma(struct i915_vma *vma, cache_level, pte_flags); } + vma->bound |= flags; return 0; } @@ -2945,10 +2948,5 @@ int i915_vma_bind(struct i915_vma *vma, enum i915_cache_level cache_level, } trace_i915_vma_bind(vma, bind_flags); - ret = vma->vm->bind_vma(vma, cache_level, bind_flags); - if (ret) - return ret; - - vma->bound |= bind_flags; - return 0; + return vma->vm->bind_vma(vma, cache_level, bind_flags); } diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem index 698a30b..59114af 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -148,7 +148,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int static int ppgtt_bind_vma(struct i915_vma *vma, enum i915_cache_level cache_level, - u32 unused) + u32 bind_flags) { u32 pte_flags = 0; @@ -159,6 +159,7 @@ static int ppgtt_bind_vma(struct i915_vma *vma, vma->vm->insert_entries(vma->vm, vma->obj->pages, vma->node.start, cache_level, pte_flags); + vma->bound |= bind_flags; return 0; } @@ -1956,6 +1957,7 @@ static int ggtt_bind_vma(struct i915_vma *vma, vma->vm->insert_entries(vma->vm, pages, : diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 698a30b..59114af 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -148,7 +148,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)