drm/amdgpu:change kiq lock name

Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index dcfb7df3caf41d811916e155ee876c84ad4df271..1fc48e1690ffcd95d31883339ee7073181c41c16 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
@@ -97,7 +97,7 @@ void amdgpu_virt_init_setting(struct amdgpu_device *adev)
        adev->mode_info.num_crtc = 1;
        adev->enable_virtual_display = true;
 
-       mutex_init(&adev->virt.lock);
+       mutex_init(&adev->virt.lock_kiq);
 }
 
 uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
@@ -110,14 +110,14 @@ uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg)
 
        BUG_ON(!ring->funcs->emit_rreg);
 
-       mutex_lock(&adev->virt.lock);
+       mutex_lock(&adev->virt.lock_kiq);
        amdgpu_ring_alloc(ring, 32);
        amdgpu_ring_emit_hdp_flush(ring);
        amdgpu_ring_emit_rreg(ring, reg);
        amdgpu_ring_emit_hdp_invalidate(ring);
        amdgpu_fence_emit(ring, &f);
        amdgpu_ring_commit(ring);
-       mutex_unlock(&adev->virt.lock);
+       mutex_unlock(&adev->virt.lock_kiq);
 
        r = dma_fence_wait(f, false);
        if (r)
@@ -138,14 +138,14 @@ void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
 
        BUG_ON(!ring->funcs->emit_wreg);
 
-       mutex_lock(&adev->virt.lock);
+       mutex_lock(&adev->virt.lock_kiq);
        amdgpu_ring_alloc(ring, 32);
        amdgpu_ring_emit_hdp_flush(ring);
        amdgpu_ring_emit_wreg(ring, reg, v);
        amdgpu_ring_emit_hdp_invalidate(ring);
        amdgpu_fence_emit(ring, &f);
        amdgpu_ring_commit(ring);
-       mutex_unlock(&adev->virt.lock);
+       mutex_unlock(&adev->virt.lock_kiq);
 
        r = dma_fence_wait(f, false);
        if (r)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
index 73d24df2efa1119030ff3c68637954c7c04b8fc8..7020ff22b9b5f158cf8020fa961b6ce6298bea66 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h
@@ -46,7 +46,7 @@ struct amdgpu_virt {
        uint64_t                        csa_vmid0_addr;
        bool chained_ib_support;
        uint32_t                        reg_val_offs;
-       struct mutex                    lock;
+       struct mutex                    lock_kiq;
        struct amdgpu_irq_src           ack_irq;
        struct amdgpu_irq_src           rcv_irq;
        struct delayed_work             flr_work;