Skip to content

Commit

Permalink
drm/i915: Don't check for NEEDS_GTT when deciding the address space
Browse files Browse the repository at this point in the history
This means something different and is only relevant for gen6 and the
reason why we cant use anything else than aliasing ppgtt there.

Note that the currently implemented logic for secure batches is
broken: Userspace wants the buffer both in ppgtt (for self-referencing
relocations) and in ggtt (for priveledge operations).

This is the same issue the command parser is also facing.
Unfortunately our coverage for corner-cases of self-referencing
batches is spotty.

Note that this will break vsync'ed Xv and DRI2 copies.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Daniel Vetter committed Dec 18, 2013
1 parent 2c9f8d5 commit a7c1d42
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/i915_gem_execbuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ eb_lookup_vmas(struct eb_vmas *eb,
/* If we have secure dispatch, or the userspace assures us that
* they know what they're doing, use the GGTT VM.
*/
if (exec[i].flags & EXEC_OBJECT_NEEDS_GTT ||
((args->flags & I915_EXEC_SECURE) &&
if (((args->flags & I915_EXEC_SECURE) &&
(i == (args->buffer_count - 1))))
bind_vm = &dev_priv->gtt.base;

Expand Down

0 comments on commit a7c1d42

Please sign in to comment.