Merge tag 'drm-intel-next-2022-04-13-1' of git://anongit.freedesktop.org/drm/drm...

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / gem / i915_gem_execbuffer.c

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index b9427d8..fd0e15d 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -999,11 +999,9 @@ static int eb_validate_vmas(struct i915_execbuffer *eb)
                        }
                }
 
-               if (!(ev->flags & EXEC_OBJECT_WRITE)) {
-                       err = dma_resv_reserve_shared(vma->obj->base.resv, 1);
-                       if (err)
-                               return err;
-               }
+               err = dma_resv_reserve_fences(vma->obj->base.resv, 1);
+               if (err)
+                       return err;
 
                GEM_BUG_ON(drm_mm_node_allocated(&vma->node) &&
                           eb_vma_misplaced(&eb->exec[i], vma, ev->flags));
@@ -2304,7 +2302,7 @@ static int eb_parse(struct i915_execbuffer *eb)
        if (IS_ERR(batch))
                return PTR_ERR(batch);
 
-       err = dma_resv_reserve_shared(shadow->obj->base.resv, 1);
+       err = dma_resv_reserve_fences(shadow->obj->base.resv, 1);
        if (err)
                return err;