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

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / i915 / gem / selftests / i915_gem_migrate.c

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
index 2c63daf..9922ac9 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_migrate.c
@@ -216,7 +216,10 @@ static int __igt_lmem_pages_migrate(struct intel_gt *gt,
                                          i915_gem_object_is_lmem(obj),
                                          0xdeadbeaf, &rq);
                if (rq) {
-                       dma_resv_add_excl_fence(obj->base.resv, &rq->fence);
+                       err = dma_resv_reserve_fences(obj->base.resv, 1);
+                       if (!err)
+                               dma_resv_add_excl_fence(obj->base.resv,
+                                                       &rq->fence);
                        i915_gem_object_set_moving_fence(obj, &rq->fence);
                        i915_request_put(rq);
                }