1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
index c4753726a79f..e7a141c75467 100644
--- a/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
@@ -164,7 +164,7 @@ static int uvd_v4_2_hw_init(void *handle)
                 goto done;
         }
 
-        r = amdgpu_ring_lock(ring, 10);
+        r = amdgpu_ring_alloc(ring, 10);
         if (r) {
                 DRM_ERROR("amdgpu: ring failed to lock UVD ring (%d).\n", r);
                 goto done;
@@ -189,7 +189,7 @@ static int uvd_v4_2_hw_init(void *handle)
         amdgpu_ring_write(ring, PACKET0(mmUVD_SEMA_CNTL, 0));
         amdgpu_ring_write(ring, 3);
 
-        amdgpu_ring_unlock_commit(ring);
+        amdgpu_ring_commit(ring);
 
 done:
         /* lower clocks again */
@@ -453,7 +453,7 @@ static int uvd_v4_2_ring_test_ring(struct amdgpu_ring *ring)
         int r;
 
         WREG32(mmUVD_CONTEXT_ID, 0xCAFEDEAD);
-        r = amdgpu_ring_lock(ring, 3);
+        r = amdgpu_ring_alloc(ring, 3);
         if (r) {
                 DRM_ERROR("amdgpu: cp failed to lock ring %d (%d).\n",
                           ring->idx, r);
@@ -461,7 +461,7 @@ static int uvd_v4_2_ring_test_ring(struct amdgpu_ring *ring)
         }
         amdgpu_ring_write(ring, PACKET0(mmUVD_CONTEXT_ID, 0));
         amdgpu_ring_write(ring, 0xDEADBEEF);
-        amdgpu_ring_unlock_commit(ring);
+        amdgpu_ring_commit(ring);
         for (i = 0; i < adev->usec_timeout; i++) {
                 tmp = RREG32(mmUVD_CONTEXT_ID);
                 if (tmp == 0xDEADBEEF)