aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c
index dcfb7df3caf4..1fc48e1690ff 100644
--- 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)
97 adev->mode_info.num_crtc = 1; 97 adev->mode_info.num_crtc = 1;
98 adev->enable_virtual_display = true; 98 adev->enable_virtual_display = true;
99 99
100 mutex_init(&adev->virt.lock); 100 mutex_init(&adev->virt.lock_kiq);
101} 101}
102 102
103uint32_t amdgpu_virt_kiq_rreg(struct amdgpu_device *adev, uint32_t reg) 103uint32_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)
110 110
111 BUG_ON(!ring->funcs->emit_rreg); 111 BUG_ON(!ring->funcs->emit_rreg);
112 112
113 mutex_lock(&adev->virt.lock); 113 mutex_lock(&adev->virt.lock_kiq);
114 amdgpu_ring_alloc(ring, 32); 114 amdgpu_ring_alloc(ring, 32);
115 amdgpu_ring_emit_hdp_flush(ring); 115 amdgpu_ring_emit_hdp_flush(ring);
116 amdgpu_ring_emit_rreg(ring, reg); 116 amdgpu_ring_emit_rreg(ring, reg);
117 amdgpu_ring_emit_hdp_invalidate(ring); 117 amdgpu_ring_emit_hdp_invalidate(ring);
118 amdgpu_fence_emit(ring, &f); 118 amdgpu_fence_emit(ring, &f);
119 amdgpu_ring_commit(ring); 119 amdgpu_ring_commit(ring);
120 mutex_unlock(&adev->virt.lock); 120 mutex_unlock(&adev->virt.lock_kiq);
121 121
122 r = dma_fence_wait(f, false); 122 r = dma_fence_wait(f, false);
123 if (r) 123 if (r)
@@ -138,14 +138,14 @@ void amdgpu_virt_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v)
138 138
139 BUG_ON(!ring->funcs->emit_wreg); 139 BUG_ON(!ring->funcs->emit_wreg);
140 140
141 mutex_lock(&adev->virt.lock); 141 mutex_lock(&adev->virt.lock_kiq);
142 amdgpu_ring_alloc(ring, 32); 142 amdgpu_ring_alloc(ring, 32);
143 amdgpu_ring_emit_hdp_flush(ring); 143 amdgpu_ring_emit_hdp_flush(ring);
144 amdgpu_ring_emit_wreg(ring, reg, v); 144 amdgpu_ring_emit_wreg(ring, reg, v);
145 amdgpu_ring_emit_hdp_invalidate(ring); 145 amdgpu_ring_emit_hdp_invalidate(ring);
146 amdgpu_fence_emit(ring, &f); 146 amdgpu_fence_emit(ring, &f);
147 amdgpu_ring_commit(ring); 147 amdgpu_ring_commit(ring);
148 mutex_unlock(&adev->virt.lock); 148 mutex_unlock(&adev->virt.lock_kiq);
149 149
150 r = dma_fence_wait(f, false); 150 r = dma_fence_wait(f, false);
151 if (r) 151 if (r)