Commit 220a6704 authored by Chris Wilson's avatar Chris Wilson

drm/i915/gt: Restore check for invalid vma for fencing

Apparently we do try and attach a fence to an invalid vma (during
execbuf) so we cannot simply assert it never happens and report EINVAL
instead.

Fixes: dec9cf9e ("drm/i915/gt: Pull restoration of GGTT fences underneath the GT")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200316205450.15843-1-chris@chris-wilson.co.uk
parent 0b6bc81d
...@@ -233,10 +233,12 @@ static int fence_update(struct i915_fence_reg *fence, ...@@ -233,10 +233,12 @@ static int fence_update(struct i915_fence_reg *fence,
int ret; int ret;
if (vma) { if (vma) {
GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
GEM_BUG_ON(!i915_gem_object_get_stride(vma->obj) || GEM_BUG_ON(!i915_gem_object_get_stride(vma->obj) ||
!i915_gem_object_get_tiling(vma->obj)); !i915_gem_object_get_tiling(vma->obj));
if (!i915_vma_is_map_and_fenceable(vma))
return -EINVAL;
ret = i915_vma_sync(vma); ret = i915_vma_sync(vma);
if (ret) if (ret)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment