drm/amdgpu: remove the ring lock v2

It's not needed any more because all access goes through the scheduler now.

v2: Update commit message.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index 16fbde9c5f56..c90517f61210 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -788,14 +788,14 @@ int amdgpu_vce_ring_test_ring(struct amdgpu_ring *ring)
         unsigned i;
         int r;
 
-        r = amdgpu_ring_lock(ring, 16);
+        r = amdgpu_ring_alloc(ring, 16);
         if (r) {
                 DRM_ERROR("amdgpu: vce failed to lock ring %d (%d).\n",
                           ring->idx, r);
                 return r;
         }
         amdgpu_ring_write(ring, VCE_CMD_END);
-        amdgpu_ring_unlock_commit(ring);
+        amdgpu_ring_commit(ring);
 
         for (i = 0; i < adev->usec_timeout; i++) {
                 if (amdgpu_ring_get_rptr(ring) != rptr)