[PATCH 1/2] drm/amdgpu: stop waiting in amdgpu_uvd_send_msg

[Christian König]

We have a wait in the amdgpu_bo_kmap() code for quite a while now, so
waiting here isn't needed any more.

Signed-off-by: Christian König <christian.koe...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index b67a5fb2ff3e..dd0894c9740d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -1122,8 +1122,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, 
struct amdgpu_bo *bo,
        struct amdgpu_ib *ib;
        uint32_t data[4];
        uint64_t addr;
-       long r;
-       int i;
+       int i, r;
        unsigned offset_idx = 0;
        unsigned offset[3] = { UVD_BASE_SI, 0, 0 };
 
@@ -1158,24 +1157,10 @@ 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(bo->tbo.base.resv,
-                                         DMA_RESV_USAGE_KERNEL, false,
-                                         msecs_to_jiffies(10));
-               if (r == 0)
-                       r = -ETIMEDOUT;
-               if (r < 0)
-                       goto err_free;
-
                r = amdgpu_job_submit_direct(job, ring, &f);
                if (r)
                        goto err_free;
        } else {
-               r = amdgpu_sync_resv(adev, &job->sync, bo->tbo.base.resv,
-                                    AMDGPU_SYNC_ALWAYS,
-                                    AMDGPU_FENCE_OWNER_UNDEFINED);
-               if (r)
-                       goto err_free;
-
                r = amdgpu_job_submit(job, &adev->uvd.entity,
                                      AMDGPU_FENCE_OWNER_UNDEFINED, &f);
                if (r)
-- 
2.34.1