Merge drm/drm-next into drm-intel-gt-next

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / i915 / i915_vma.c

diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c
index 34e2608..033ef69 100644 (file)
--- a/drivers/gpu/drm/i915/i915_vma.c
+++ b/drivers/gpu/drm/i915/i915_vma.c
@@ -1829,6 +1829,12 @@ int _i915_vma_move_to_active(struct i915_vma *vma,
                        intel_frontbuffer_put(front);
                }
 
+               if (!(flags & __EXEC_OBJECT_NO_RESERVE)) {
+                       err = dma_resv_reserve_fences(vma->obj->base.resv, 1);
+                       if (unlikely(err))
+                               return err;
+               }
+
                if (fence) {
                        dma_resv_add_excl_fence(vma->obj->base.resv, fence);
                        obj->write_domain = I915_GEM_DOMAIN_RENDER;
@@ -1836,7 +1842,7 @@ int _i915_vma_move_to_active(struct i915_vma *vma,
                }
        } else {
                if (!(flags & __EXEC_OBJECT_NO_RESERVE)) {
-                       err = dma_resv_reserve_shared(vma->obj->base.resv, 1);
+                       err = dma_resv_reserve_fences(vma->obj->base.resv, 1);
                        if (unlikely(err))
                                return err;
                }
@@ -2056,7 +2062,7 @@ int i915_vma_unbind_async(struct i915_vma *vma, bool trylock_vm)
        if (!obj->mm.rsgt)
                return -EBUSY;
 
-       err = dma_resv_reserve_shared(obj->base.resv, 1);
+       err = dma_resv_reserve_fences(obj->base.resv, 1);
        if (err)
                return -EBUSY;