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

drm/amd/pm: fix possible power mode mismatch between driver and PMFW 



PMFW may boots the ASIC with a different power mode from the system's
real one. Notify PMFW explicitly the power mode the system in. This
is needed only when ACDC switch via gpio is not supported.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarKenneth Feng <kenneth.feng@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 3083b100

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

+18 −0
Original line number Diff line number Diff line
@@ -733,6 +733,24 @@ static int smu_late_init(void *handle) 
		return ret;

	}



	/*

	 * Explicitly notify PMFW the power mode the system in. Since

	 * the PMFW may boot the ASIC with a different mode.

	 * For those supporting ACDC switch via gpio, PMFW will

	 * handle the switch automatically. Driver involvement

	 * is unnecessary.

	 */

	if (!smu->dc_controlled_by_gpio) {

		ret = smu_set_power_source(smu,

					   adev->pm.ac_power ? SMU_POWER_SOURCE_AC :

					   SMU_POWER_SOURCE_DC);

		if (ret) {

			dev_err(adev->dev, "Failed to switch to %s mode!\n",

				adev->pm.ac_power ? "AC" : "DC");

			return ret;

		}

	}



	if ((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 1)) ||

	    (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 3)))

		return 0;

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

+1 −19
Original line number Diff line number Diff line
@@ -3413,26 +3413,8 @@ static int navi10_post_smu_init(struct smu_context *smu) 
		return 0;



	ret = navi10_run_umc_cdr_workaround(smu);

	if (ret) {

	if (ret)

		dev_err(adev->dev, "Failed to apply umc cdr workaround!\n");

		return ret;

	}



	if (!smu->dc_controlled_by_gpio) {

		/*

		 * For Navi1X, manually switch it to AC mode as PMFW

		 * may boot it with DC mode.

		 */

		ret = smu_v11_0_set_power_source(smu,

						 adev->pm.ac_power ?

						 SMU_POWER_SOURCE_AC :

						 SMU_POWER_SOURCE_DC);

		if (ret) {

			dev_err(adev->dev, "Failed to switch to %s mode!\n",

					adev->pm.ac_power ? "AC" : "DC");

			return ret;

		}

	}



	return ret;

}

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c

+1 −0
Original line number Diff line number Diff line
@@ -1770,6 +1770,7 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = { 
	.enable_mgpu_fan_boost = smu_v13_0_7_enable_mgpu_fan_boost,

	.get_power_limit = smu_v13_0_7_get_power_limit,

	.set_power_limit = smu_v13_0_set_power_limit,

	.set_power_source = smu_v13_0_set_power_source,

	.get_power_profile_mode = smu_v13_0_7_get_power_profile_mode,

	.set_power_profile_mode = smu_v13_0_7_set_power_profile_mode,

	.set_tool_table_location = smu_v13_0_set_tool_table_location,