diff options
| author | Andrey Grodzovsky <[email protected]> | 2022-01-25 16:36:18 +0000 |
|---|---|---|
| committer | Andrey Grodzovsky <[email protected]> | 2022-02-09 17:19:14 +0000 |
| commit | 3675c2f26f33ab4928859fb8950a4697a16be5c9 (patch) | |
| tree | fe143535fc35bf23461f21ee35aca29689a2544f /drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | |
| parent | drm/amdgpu: Rework amdgpu_device_lock_adev (diff) | |
| download | kernel-3675c2f26f33ab4928859fb8950a4697a16be5c9.tar.gz kernel-3675c2f26f33ab4928859fb8950a4697a16be5c9.zip | |
drm/amdgpu: Revert 'drm/amdgpu: annotate a false positive recursive locking'
Since we have a single instance of reset semaphore which we
lock only once even for XGMI hive we don't need the nested
locking hint anymore.
Signed-off-by: Andrey Grodzovsky <[email protected]>
Reviewed-by: Christian König <[email protected]>
Link: https://www.spinics.net/lists/amd-gfx/msg74120.html
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c index 9b18ad0b77ab..248d64158721 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c @@ -137,16 +137,10 @@ struct amdgpu_reset_domain *amdgpu_reset_create_reset_domain(enum amdgpu_reset_d return reset_domain; } -void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain *reset_domain, - struct amdgpu_hive_info *hive) +void amdgpu_device_lock_reset_domain(struct amdgpu_reset_domain *reset_domain) { atomic_set(&reset_domain->in_gpu_reset, 1); - - if (hive) { - down_write_nest_lock(&reset_domain->sem, &hive->hive_lock); - } else { - down_write(&reset_domain->sem); - } + down_write(&reset_domain->sem); } |