[Intel-gfx] [PATCH 5/6] drm/i915: Use the new vm [un]bind functions

[Ben Widawsky]

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