Commit 4b14841c authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/pm: fix SMU13 runpm hang due to unintentional workaround 



The workaround designed for some specific ASICs is wrongly applied
to SMU13 ASICs. That leads to some runpm hang.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent df7c013e

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

+11 −12
Original line number Diff line number Diff line
@@ -1156,23 +1156,22 @@ static int smu_smc_hw_setup(struct smu_context *smu) 
	uint64_t features_supported;

	int ret = 0;



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

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

		/* this is needed specifically */

	switch (adev->ip_versions[MP1_HWIP][0]) {

	case IP_VERSION(11, 0, 7):

	case IP_VERSION(11, 0, 11):

	case IP_VERSION(11, 5, 0):

	case IP_VERSION(11, 0, 12):

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

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

			ret = smu_system_features_control(smu, true);

			if (ret)

				dev_err(adev->dev, "Failed system features control!\n");

			return ret;

		}

		break;

	default:

		break;

	}

		return ret;

	}



	ret = smu_init_display_count(smu, 0);

	if (ret) {