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/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index 622f5dad6f2a..9fae4bf1a6c6 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -611,7 +611,7 @@ static int sdma_v2_4_ring_test_ring(struct amdgpu_ring *ring)
         tmp = 0xCAFEDEAD;
         adev->wb.wb[index] = cpu_to_le32(tmp);
 
-        r = amdgpu_ring_lock(ring, 5);
+        r = amdgpu_ring_alloc(ring, 5);
         if (r) {
                 DRM_ERROR("amdgpu: dma failed to lock ring %d (%d).\n", ring->idx, r);
                 amdgpu_wb_free(adev, index);
@@ -624,7 +624,7 @@ static int sdma_v2_4_ring_test_ring(struct amdgpu_ring *ring)
         amdgpu_ring_write(ring, upper_32_bits(gpu_addr));
         amdgpu_ring_write(ring, SDMA_PKT_WRITE_UNTILED_DW_3_COUNT(1));
         amdgpu_ring_write(ring, 0xDEADBEEF);
-        amdgpu_ring_unlock_commit(ring);
+        amdgpu_ring_commit(ring);
 
         for (i = 0; i < adev->usec_timeout; i++) {
                 tmp = le32_to_cpu(adev->wb.wb[index]);