UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/amdgpu/gmc: Use consistent variable on unlocks 

Currently the error returns paths are unlocking lock kiq->ring_lock
however it seems this should be dev->gfx.kiq.ring_lock as this
is the lock that is being locked and unlocked around the ring
operations.  This looks like a bug, but it's not.  The kiq is just
a local variable pointing to the same structure.  Make it consistent.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Colin Ian King 2020-04-24 13:56:40 +01:00 committed by Alex Deucher
parent a96f661a47
commit abb17b1edf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
View File

@ -429,7 +429,7 @@ static int gmc_v10_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT); r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT);
if (r) { if (r) {
amdgpu_ring_undo(ring); amdgpu_ring_undo(ring);
spin_unlock(&kiq->ring_lock); spin_unlock(&adev->gfx.kiq.ring_lock);
return -ETIME; return -ETIME;
} }

2
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
View File

@ -624,7 +624,7 @@ static int gmc_v9_0_flush_gpu_tlb_pasid(struct amdgpu_device *adev,
r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT); r = amdgpu_fence_emit_polling(ring, &seq, MAX_KIQ_REG_WAIT);
if (r) { if (r) {
amdgpu_ring_undo(ring); amdgpu_ring_undo(ring);
spin_unlock(&kiq->ring_lock); spin_unlock(&adev->gfx.kiq.ring_lock);
return -ETIME; return -ETIME;
} }