drm/amdgpu: stop waiting on UVD messages before mapping them

amdgpu_bo_kmap() now always waits for moves to finish.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 0 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index e5f0a5e29551..081ee0565f87 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -539,13 +539,6 @@ static int amdgpu_uvd_cs_msg(struct amdgpu_uvd_cs_ctx *ctx,
                 return -EINVAL;
         }
 
-        r = reservation_object_wait_timeout_rcu(bo->tbo.resv, true, false,
-                                                MAX_SCHEDULE_TIMEOUT);
-        if (r < 0) {
-                DRM_ERROR("Failed waiting for UVD message (%ld)!\n", r);
-                return r;
-        }
-
         r = amdgpu_bo_kmap(bo, &ptr);
         if (r) {
                 DRM_ERROR("Failed mapping the UVD message (%ld)!\n", r);