On Wed, Sep 18, 2013 at 05:12:37PM -0700, Ben Widawsky wrote:
> @@ -1117,8 +1109,26 @@ 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) {
> + struct i915_address_space *ggtt = obj_to_ggtt(batch_obj);
> + /* Assuming all privileged batches are in the global GTT means
> + * we need to make sure we have a global gtt offset, as well as
> + * the PTEs mapped. As mentioned above, we can forego this on
> + * HSW, but don't.
> + */
> + ret = i915_gem_object_bind_to_vm(batch_obj, ggtt, 0, false,
> + false);
> + if (ret)
> + goto err;
> +
> + if (!batch_obj->has_global_gtt_mapping) {
> + struct i915_vma *vma = i915_gem_obj_to_ggtt(batch_obj);
> + BUG_ON(!vma);
> + ggtt->bind_vma(vma, batch_obj->cache_level,
> + GLOBAL_BIND);
> + }
Just loose the vma =..., BUG_ON(vma == NULL), it makes it less readable.
And I blame that loss of readability for the bug here.
> + } else
> + exec_start += i915_gem_obj_offset(batch_obj, vm);
>
> ret = i915_gem_execbuffer_move_to_gpu(ring, &eb->vmas);
> if (ret)
--
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
