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

drm/amd/pm: correct VRconfig setting 



Correct Polaris VRconfig setting.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a6d8a6eb

drivers/gpu/drm/amd/pm/powerplay/smumgr/polaris10_smumgr.c

+14 −1
Original line number Diff line number Diff line
@@ -1712,6 +1712,9 @@ static int polaris10_populate_vr_config(struct pp_hwmgr *hwmgr, 
	if (SMU7_VOLTAGE_CONTROL_BY_SVID2 == data->voltage_control) {

		config = VR_SVI2_PLANE_1;

		table->VRConfig |= config;

	} else if (SMU7_VOLTAGE_CONTROL_BY_GPIO == data->voltage_control) {

		config = VR_SMIO_PATTERN_1;

		table->VRConfig |= config;

	} else {

		PP_ASSERT_WITH_CODE(false,

				"VDDC should be on SVI2 control in merged mode!",
@@ -1730,6 +1733,7 @@ static int polaris10_populate_vr_config(struct pp_hwmgr *hwmgr, 
	}

	/* Set Mvdd Voltage Controller */

	if (SMU7_VOLTAGE_CONTROL_BY_SVID2 == data->mvdd_control) {

		if (config != VR_SVI2_PLANE_2) {

			config = VR_SVI2_PLANE_2;

			table->VRConfig |= (config << VRCONF_MVDD_SHIFT);

			cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC, smu_data->smu7_data.soft_regs_start +
@@ -1738,6 +1742,15 @@ static int polaris10_populate_vr_config(struct pp_hwmgr *hwmgr, 
			config = VR_STATIC_VOLTAGE;

			table->VRConfig |= (config << VRCONF_MVDD_SHIFT);

		}

	} else if (SMU7_VOLTAGE_CONTROL_BY_GPIO == data->mvdd_control) {

		config = VR_SMIO_PATTERN_2;

		table->VRConfig |= (config << VRCONF_MVDD_SHIFT);

		cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC, smu_data->smu7_data.soft_regs_start +

			offsetof(SMU74_SoftRegisters, AllowMvddSwitch), 0x1);

	} else {

		config = VR_STATIC_VOLTAGE;

		table->VRConfig |= (config << VRCONF_MVDD_SHIFT);

	}



	return 0;

}