Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0168f78f authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: fix issue that resume back, dpm can't work on FIJI. 



Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d23be4e3

drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c

+6 −0
Original line number Diff line number Diff line
@@ -2389,6 +2389,7 @@ static int fiji_populate_smc_vce_level(struct pp_hwmgr *hwmgr, 


	for(count = 0; count < table->VceLevelCount; count++) {

		table->VceLevel[count].Frequency = mm_table->entries[count].eclk;

		table->VceLevel[count].MinVoltage = 0;

		table->VceLevel[count].MinVoltage |=

				(mm_table->entries[count].vddc * VOLTAGE_SCALE) << VDDC_SHIFT;

		table->VceLevel[count].MinVoltage |=
@@ -2465,6 +2466,7 @@ static int fiji_populate_smc_samu_level(struct pp_hwmgr *hwmgr, 


	for (count = 0; count < table->SamuLevelCount; count++) {

		/* not sure whether we need evclk or not */

		table->SamuLevel[count].MinVoltage = 0;

		table->SamuLevel[count].Frequency = mm_table->entries[count].samclock;

		table->SamuLevel[count].MinVoltage |= (mm_table->entries[count].vddc *

				VOLTAGE_SCALE) << VDDC_SHIFT;
@@ -2562,6 +2564,7 @@ static int fiji_populate_smc_uvd_level(struct pp_hwmgr *hwmgr, 
	table->UvdBootLevel = 0;



	for (count = 0; count < table->UvdLevelCount; count++) {

		table->UvdLevel[count].MinVoltage = 0;

		table->UvdLevel[count].VclkFrequency = mm_table->entries[count].vclk;

		table->UvdLevel[count].DclkFrequency = mm_table->entries[count].dclk;

		table->UvdLevel[count].MinVoltage |= (mm_table->entries[count].vddc *
@@ -2900,6 +2903,8 @@ static int fiji_init_smc_table(struct pp_hwmgr *hwmgr) 
	if(FIJI_VOLTAGE_CONTROL_NONE != data->voltage_control)

		fiji_populate_smc_voltage_tables(hwmgr, table);



	table->SystemFlags = 0;



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_AutomaticDCTransition))

		table->SystemFlags |= PPSMC_SYSTEMFLAG_GPIO_DC;
@@ -2997,6 +3002,7 @@ static int fiji_init_smc_table(struct pp_hwmgr *hwmgr) 
	table->MemoryThermThrottleEnable = 1;

	table->PCIeBootLinkLevel = 0;      /* 0:Gen1 1:Gen2 2:Gen3*/

	table->PCIeGenInterval = 1;

	table->VRConfig = 0;



	result = fiji_populate_vr_config(hwmgr, table);

	PP_ASSERT_WITH_CODE(0 == result,