[PATCH v8 1/3] drm/i915/gt: Restore check for invalid vma for fencing
Ankit Navik
ankit.p.navik at intel.com
Thu Mar 19 04:25:21 UTC 2020
From: Chris Wilson <chris at chris-wilson.co.uk>
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: dec9cf9ee8cb ("drm/i915/gt: Pull restoration of GGTT fences underneath the GT")
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala at linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200316205450.15843-1-chris@chris-wilson.co.uk
---
drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
index b6ba68c42546..225970f4a4ef 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c
@@ -233,10 +233,12 @@ static int fence_update(struct i915_fence_reg *fence,
int ret;
if (vma) {
- GEM_BUG_ON(!i915_vma_is_map_and_fenceable(vma));
GEM_BUG_ON(!i915_gem_object_get_stride(vma->obj) ||
!i915_gem_object_get_tiling(vma->obj));
+ if (!i915_vma_is_map_and_fenceable(vma))
+ return -EINVAL;
+
ret = i915_vma_sync(vma);
if (ret)
return ret;
--
2.7.4
More information about the Intel-gfx-trybot
mailing list