Commit ddc3344f authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amd/pm: fix the crash after runtime pm resume 



Some features are still disabled after runtime pm resume. This can take
the hardware back.
Unlike other projects, this doesn't need pptable retransfer.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7203a2fd

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+6 −2
Original line number Diff line number Diff line
@@ -918,11 +918,15 @@ static int smu_smc_hw_setup(struct smu_context *smu) 
{

	struct amdgpu_device *adev = smu->adev;

	uint32_t pcie_gen = 0, pcie_width = 0;

	int ret;

	int ret = 0;



	if (adev->in_suspend && smu_is_dpm_running(smu)) {

		dev_info(adev->dev, "dpm has been enabled\n");

		return 0;

		/* this is needed specifically */

		if ((adev->asic_type >= CHIP_SIENNA_CICHLID) &&

		    (adev->asic_type <= CHIP_DIMGREY_CAVEFISH))

			ret = smu_system_features_control(smu, true);

		return ret;

	}



	ret = smu_init_display_count(smu, 0);