Commit 3675c2f2 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky
Browse files

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: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://www.spinics.net/lists/amd-gfx/msg74120.html
parent e923be99

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+2 −2
Original line number Diff line number Diff line
@@ -5053,7 +5053,7 @@ int amdgpu_device_gpu_recover_imp(struct amdgpu_device *adev, 
	/* We need to lock reset domain only once both for XGMI and single device */

	tmp_adev = list_first_entry(device_list_handle, struct amdgpu_device,

				    reset_list);

	amdgpu_device_lock_reset_domain(tmp_adev->reset_domain, hive);

	amdgpu_device_lock_reset_domain(tmp_adev->reset_domain);



	/* block all schedulers and reset given job's ring */

	list_for_each_entry(tmp_adev, device_list_handle, reset_list) {
@@ -5477,7 +5477,7 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta 
		 * Locking adev->reset_domain->sem will prevent any external access

		 * to GPU during PCI error recovery

		 */

		amdgpu_device_lock_reset_domain(adev->reset_domain, NULL);

		amdgpu_device_lock_reset_domain(adev->reset_domain);

		amdgpu_device_set_mp1_state(adev);



		/*

drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c

+2 −8
Original line number Diff line number Diff line
@@ -137,17 +137,11 @@ 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);

}

}





void amdgpu_device_unlock_reset_domain(struct amdgpu_reset_domain *reset_domain)