Revert "drm/amdgpu: Add missing locking for MES API calls"

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_mes.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
index 1a65ced60e68403bca0d1fe873062df5a1d898a6..48a5b0713fed8b1523c0e178392c6bbeec6f2f60 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c
@@ -801,9 +801,7 @@ int amdgpu_mes_map_legacy_queue(struct amdgpu_device *adev,
        queue_input.mqd_addr = amdgpu_bo_gpu_offset(ring->mqd_obj);
        queue_input.wptr_addr = ring->wptr_gpu_addr;
 
-       amdgpu_mes_lock(&adev->mes);
        r = adev->mes.funcs->map_legacy_queue(&adev->mes, &queue_input);
-       amdgpu_mes_unlock(&adev->mes);
        if (r)
                DRM_ERROR("failed to map legacy queue\n");
 
@@ -826,9 +824,7 @@ int amdgpu_mes_unmap_legacy_queue(struct amdgpu_device *adev,
        queue_input.trail_fence_addr = gpu_addr;
        queue_input.trail_fence_data = seq;
 
-       amdgpu_mes_lock(&adev->mes);
        r = adev->mes.funcs->unmap_legacy_queue(&adev->mes, &queue_input);
-       amdgpu_mes_unlock(&adev->mes);
        if (r)
                DRM_ERROR("failed to unmap legacy queue\n");
 
@@ -849,13 +845,11 @@ uint32_t amdgpu_mes_rreg(struct amdgpu_device *adev, uint32_t reg)
                goto error;
        }
 
-       amdgpu_mes_lock(&adev->mes);
        r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
        if (r)
                DRM_ERROR("failed to read reg (0x%x)\n", reg);
        else
                val = *(adev->mes.read_val_ptr);
-       amdgpu_mes_unlock(&adev->mes);
 
 error:
        return val;
@@ -877,9 +871,7 @@ int amdgpu_mes_wreg(struct amdgpu_device *adev,
                goto error;
        }
 
-       amdgpu_mes_lock(&adev->mes);
        r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
-       amdgpu_mes_unlock(&adev->mes);
        if (r)
                DRM_ERROR("failed to write reg (0x%x)\n", reg);
 
@@ -906,9 +898,7 @@ int amdgpu_mes_reg_write_reg_wait(struct amdgpu_device *adev,
                goto error;
        }
 
-       amdgpu_mes_lock(&adev->mes);
        r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
-       amdgpu_mes_unlock(&adev->mes);
        if (r)
                DRM_ERROR("failed to reg_write_reg_wait\n");
 
@@ -933,9 +923,7 @@ int amdgpu_mes_reg_wait(struct amdgpu_device *adev, uint32_t reg,
                goto error;
        }
 
-       amdgpu_mes_lock(&adev->mes);
        r = adev->mes.funcs->misc_op(&adev->mes, &op_input);
-       amdgpu_mes_unlock(&adev->mes);
        if (r)
                DRM_ERROR("failed to reg_write_reg_wait\n");