Merge tag 'drm-misc-next-2021-06-09' of git://anongit.freedesktop.org/drm/drm-misc...

[linux-2.6-microblaze.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_uvd.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index ce8f80a..0f576f2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -1125,9 +1125,8 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo,
        ib->length_dw = 16;
 
        if (direct) {
-               r = dma_resv_wait_timeout_rcu(bo->tbo.base.resv,
-                                                       true, false,
-                                                       msecs_to_jiffies(10));
+               r = dma_resv_wait_timeout(bo->tbo.base.resv, true, false,
+                                         msecs_to_jiffies(10));
                if (r == 0)
                        r = -ETIMEDOUT;
                if (r < 0)