Commit c1456fad authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Release hive reference properly 



xgmi hive reference is taken on function entry, but not released
correctly for all paths. Use __free() to release reference properly.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarCe Sun <cesun102@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2a7a794e

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

+3 −4
Original line number Diff line number Diff line
@@ -6937,7 +6937,8 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta 
{

	struct drm_device *dev = pci_get_drvdata(pdev);

	struct amdgpu_device *adev = drm_to_adev(dev);

	struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev);

	struct amdgpu_hive_info *hive __free(xgmi_put_hive) =

		amdgpu_get_xgmi_hive(adev);

	struct amdgpu_reset_context reset_context;

	struct list_head device_list;
@@ -6976,10 +6977,8 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta 
		amdgpu_device_recovery_get_reset_lock(adev, &device_list);

		amdgpu_device_halt_activities(adev, NULL, &reset_context, &device_list,

					      hive, false);

		if (hive) {

		if (hive)

			mutex_unlock(&hive->hive_lock);

			amdgpu_put_xgmi_hive(hive);

		}

		return PCI_ERS_RESULT_NEED_RESET;

	case pci_channel_io_perm_failure:

		/* Permanent error, prepare for device removal */

drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h

+4 −0
Original line number Diff line number Diff line
@@ -126,4 +126,8 @@ uint32_t amdgpu_xgmi_get_max_bandwidth(struct amdgpu_device *adev); 


void amgpu_xgmi_set_max_speed_width(struct amdgpu_device *adev,

				    uint16_t max_speed, uint8_t max_width);



/* Cleanup macro for use with __free(xgmi_put_hive) */

DEFINE_FREE(xgmi_put_hive, struct amdgpu_hive_info *, if (_T) amdgpu_put_xgmi_hive(_T))



#endif