Commit aaee0ce4 authored by Tim Huang's avatar Tim Huang Committed by Alex Deucher
Browse files

drm/amdgpu: reposition the gpu reset checking for reuse 



Move the amdgpu_acpi_should_gpu_reset out of
CONFIG_SUSPEND to share it with hibernate case.

Signed-off-by: default avatarTim Huang <tim.huang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 6.1.x
parent e8d018dd

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

+2 −2
Original line number Diff line number Diff line
@@ -1391,10 +1391,12 @@ int amdgpu_acpi_smart_shift_update(struct drm_device *dev, enum amdgpu_ss ss_sta 
int amdgpu_acpi_pcie_notify_device_ready(struct amdgpu_device *adev);



void amdgpu_acpi_get_backlight_caps(struct amdgpu_dm_backlight_caps *caps);

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev);

void amdgpu_acpi_detect(void);

#else

static inline int amdgpu_acpi_init(struct amdgpu_device *adev) { return 0; }

static inline void amdgpu_acpi_fini(struct amdgpu_device *adev) { }

static inline bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev) { return false; }

static inline void amdgpu_acpi_detect(void) { }

static inline bool amdgpu_acpi_is_power_shift_control_supported(void) { return false; }

static inline int amdgpu_acpi_power_shift_control(struct amdgpu_device *adev,
@@ -1405,11 +1407,9 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev, 


#if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND)

bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev);

bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);

#else

static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev) { return false; }

static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }

#endif

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

+23 −18
Original line number Diff line number Diff line
@@ -971,6 +971,29 @@ static bool amdgpu_atcs_pci_probe_handle(struct pci_dev *pdev) 
	return true;

}





/**

 * amdgpu_acpi_should_gpu_reset

 *

 * @adev: amdgpu_device_pointer

 *

 * returns true if should reset GPU, false if not

 */

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev)

{

	if (adev->flags & AMD_IS_APU)

		return false;



	if (amdgpu_sriov_vf(adev))

		return false;



#if IS_ENABLED(CONFIG_SUSPEND)

	return pm_suspend_target_state != PM_SUSPEND_TO_IDLE;

#else

	return true;

#endif

}



/*

 * amdgpu_acpi_detect - detect ACPI ATIF/ATCS methods

 *
@@ -1042,24 +1065,6 @@ bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) 
		(pm_suspend_target_state == PM_SUSPEND_MEM);

}



/**

 * amdgpu_acpi_should_gpu_reset

 *

 * @adev: amdgpu_device_pointer

 *

 * returns true if should reset GPU, false if not

 */

bool amdgpu_acpi_should_gpu_reset(struct amdgpu_device *adev)

{

	if (adev->flags & AMD_IS_APU)

		return false;



	if (amdgpu_sriov_vf(adev))

		return false;



	return pm_suspend_target_state != PM_SUSPEND_TO_IDLE;

}



/**

 * amdgpu_acpi_is_s0ix_active

 *