leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: nuke the ih reentrant lock

Browse Source 
Interrupts on are non-reentrant on linux. This is just an ancient
leftover from radeon where irq processing was kicked of from different
places.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König
2021-03-12 14:00:33 +01:00
committed by Alex Deucher
parent 7816e4a98c
commit d423f5514d
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
View File

@@ -3284,7 +3284,6 @@ int amdgpu_device_init(struct amdgpu_device *adev,
/* mutex initialization are all done here so we /* mutex initialization are all done here so we
* can recall function without having locking issues */ * can recall function without having locking issues */
atomic_set(&adev->irq.ih.lock, 0);
mutex_init(&adev->firmware.mutex); mutex_init(&adev->firmware.mutex);
mutex_init(&adev->pm.mutex); mutex_init(&adev->pm.mutex);
mutex_init(&adev->gfx.gpu_clock_mutex); mutex_init(&adev->gfx.gpu_clock_mutex);

5
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
View File

@@ -228,10 +228,6 @@ int amdgpu_ih_process(struct amdgpu_device *adev, struct amdgpu_ih_ring *ih)
wptr = amdgpu_ih_get_wptr(adev, ih); wptr = amdgpu_ih_get_wptr(adev, ih);
restart_ih: restart_ih:
/* is somebody else already processing irqs? */
if (atomic_xchg(&ih->lock, 1))
return IRQ_NONE;
DRM_DEBUG("%s: rptr %d, wptr %d\n", __func__, ih->rptr, wptr); DRM_DEBUG("%s: rptr %d, wptr %d\n", __func__, ih->rptr, wptr);
/* Order reading of wptr vs. reading of IH ring data */ /* Order reading of wptr vs. reading of IH ring data */
@@ -244,7 +240,6 @@ restart_ih:
amdgpu_ih_set_rptr(adev, ih); amdgpu_ih_set_rptr(adev, ih);
wake_up_all(&ih->wait_process); wake_up_all(&ih->wait_process);
atomic_set(&ih->lock, 0);
/* make sure wptr hasn't changed while processing */ /* make sure wptr hasn't changed while processing */
wptr = amdgpu_ih_get_wptr(adev, ih); wptr = amdgpu_ih_get_wptr(adev, ih);

1
drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h
View File

@@ -64,7 +64,6 @@ struct amdgpu_ih_ring {
bool enabled; bool enabled;
unsigned rptr; unsigned rptr;
atomic_t lock;
struct amdgpu_ih_regs ih_regs; struct amdgpu_ih_regs ih_regs;
/* For waiting on IH processing at checkpoint. */ /* For waiting on IH processing at checkpoint. */