1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index e8bd50cf9785..2f2a9e17fdb4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -232,7 +232,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
         ring = &adev->uvd.ring;
         rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL];
         r = amd_sched_entity_init(&ring->sched, &adev->uvd.entity,
-                                  rq, amdgpu_sched_jobs);
+                                  rq, amdgpu_sched_jobs, NULL);
         if (r != 0) {
                 DRM_ERROR("Failed setting up UVD run queue.\n");
                 return r;
@@ -408,6 +408,7 @@ static u64 amdgpu_uvd_get_addr_from_ctx(struct amdgpu_uvd_cs_ctx *ctx)
  */
 static int amdgpu_uvd_cs_pass1(struct amdgpu_uvd_cs_ctx *ctx)
 {
+        struct ttm_operation_ctx tctx = { false, false };
         struct amdgpu_bo_va_mapping *mapping;
         struct amdgpu_bo *bo;
         uint32_t cmd;
@@ -430,7 +431,7 @@ static int amdgpu_uvd_cs_pass1(struct amdgpu_uvd_cs_ctx *ctx)
                 }
                 amdgpu_uvd_force_into_uvd_segment(bo);
 
-                r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false);
+                r = ttm_bo_validate(&bo->tbo, &bo->placement, &tctx);
         }
 
         return r;
@@ -949,6 +950,7 @@ int amdgpu_uvd_ring_parse_cs(struct amdgpu_cs_parser *parser, uint32_t ib_idx)
 static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo,
                                bool direct, struct dma_fence **fence)
 {
+        struct ttm_operation_ctx ctx = { true, false };
         struct ttm_validate_buffer tv;
         struct ww_acquire_ctx ticket;
         struct list_head head;
@@ -975,7 +977,7 @@ static int amdgpu_uvd_send_msg(struct amdgpu_ring *ring, struct amdgpu_bo *bo,
                 amdgpu_uvd_force_into_uvd_segment(bo);
         }
 
-        r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false);
+        r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);
         if (r)
                 goto err;
 
@@ -1218,7 +1220,7 @@ int amdgpu_uvd_ring_test_ib(struct amdgpu_ring *ring, long timeout)
         } else if (r < 0) {
                 DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r);
         } else {
-                DRM_INFO("ib test on ring %d succeeded\n",  ring->idx);
+                DRM_DEBUG("ib test on ring %d succeeded\n",  ring->idx);
                 r = 0;
         }