From: Ben Widawsky Subject: Re: [PATCH 5/6] drm/i915: Use the new vm [un]bind functions Date: Mon, 16 Sep 2013 11:31:52 -0700 Message-ID: <20130916183152.GB15013@bwidawsk.net> References: <1379196199-11295-1-git-send-email-benjamin.widawsky@intel.com> <1379196199-11295-5-git-send-email-benjamin.widawsky@intel.com> <20130916073705.GA27478@nuc-i3427.alporthouse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.bwidawsk.net (bwidawsk.net [166.78.191.112]) by gabe.freedesktop.org (Postfix) with ESMTP id D1D65E70DD for ; Mon, 16 Sep 2013 11:31:55 -0700 (PDT) Content-Disposition: inline In-Reply-To: <20130916073705.GA27478@nuc-i3427.alporthouse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Chris Wilson , Ben Widawsky , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Mon, Sep 16, 2013 at 08:37:05AM +0100, Chris Wilson wrote: > On Sat, Sep 14, 2013 at 03:03:18PM -0700, Ben Widawsky wrote: > > @@ -1117,8 +1109,11 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, > > * batch" bit. Hence we need to pin secure batches into the global gtt. > > * hsw should have this fixed, but let's be paranoid and do it > > * unconditionally for now. */ > > - if (flags & I915_DISPATCH_SECURE && !batch_obj->has_global_gtt_mapping) > > - i915_gem_gtt_bind_object(batch_obj, batch_obj->cache_level); > > + if (flags & I915_DISPATCH_SECURE && > > + !batch_obj->has_global_gtt_mapping) { > > + struct i915_vma *vma = i915_gem_obj_to_vma(batch_obj, vm); > > + vm->bind_vma(vma, batch_obj->cache_level, GLOBAL_BIND); > > + } > > This should be ggtt rather than vm? > -Chris Yep. Thanks. I will also use your new requested helper function. > > -- > Chris Wilson, Intel Open Source Technology Centre -- Ben Widawsky, Intel Open Source Technology Center