Merge tag 'drm-next-2023-11-07' of git://anongit.freedesktop.org/drm/drm

[sfrench/cifs-2.6.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_amdkfd_gpuvm.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
index 23448359838b980a5d66bbcff6ccf5570c4b9edc..41fbc4fd0fac303176d7ecb386f81d8af8cac2c6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c
@@ -1144,7 +1144,7 @@ static int reserve_bo_and_vm(struct kgd_mem *mem,
                if (unlikely(ret))
                        goto error;
 
-               ret = drm_exec_lock_obj(&ctx->exec, &bo->tbo.base);
+               ret = drm_exec_prepare_obj(&ctx->exec, &bo->tbo.base, 1);
                drm_exec_retry_on_contention(&ctx->exec);
                if (unlikely(ret))
                        goto error;