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

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

drm/amd/powerplay: Add Vega10 Powertune Table v3 support. 



Handle the latest powerplay table format; includes Boost
State support.

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

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_pptable.h

+31 −0
Original line number Diff line number Diff line
@@ -355,6 +355,37 @@ typedef struct _ATOM_Vega10_PowerTune_Table_V2 
	USHORT usTemperatureLimitTedge;

} ATOM_Vega10_PowerTune_Table_V2;



typedef struct _ATOM_Vega10_PowerTune_Table_V3

{

	UCHAR  ucRevId;

	USHORT usSocketPowerLimit;

	USHORT usBatteryPowerLimit;

	USHORT usSmallPowerLimit;

	USHORT usTdcLimit;

	USHORT usEdcLimit;

	USHORT usSoftwareShutdownTemp;

	USHORT usTemperatureLimitHotSpot;

	USHORT usTemperatureLimitLiquid1;

	USHORT usTemperatureLimitLiquid2;

	USHORT usTemperatureLimitHBM;

	USHORT usTemperatureLimitVrSoc;

	USHORT usTemperatureLimitVrMem;

	USHORT usTemperatureLimitPlx;

	USHORT usLoadLineResistance;

	UCHAR  ucLiquid1_I2C_address;

	UCHAR  ucLiquid2_I2C_address;

	UCHAR  ucLiquid_I2C_Line;

	UCHAR  ucVr_I2C_address;

	UCHAR  ucVr_I2C_Line;

	UCHAR  ucPlx_I2C_address;

	UCHAR  ucPlx_I2C_Line;

	USHORT usTemperatureLimitTedge;

	USHORT usBoostStartTemperature;

	USHORT usBoostStopTemperature;

	ULONG  ulBoostClock;

	ULONG  Reserved[2];

} ATOM_Vega10_PowerTune_Table_V3;



typedef struct _ATOM_Vega10_Hard_Limit_Record {

    ULONG  ulSOCCLKLimit;

    ULONG  ulGFXCLKLimit;

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

+43 −3
Original line number Diff line number Diff line
@@ -210,10 +210,8 @@ static int init_thermal_controller( 
				fan_table_v2->ucFanParameters & ATOM_VEGA10_PP_FANPARAMETERS_TACHOMETER_PULSES_PER_REVOLUTION_MASK;

		hwmgr->thermal_controller.fanInfo.ulMinRPM = fan_table_v2->ucFanMinRPM * 100UL;

		hwmgr->thermal_controller.fanInfo.ulMaxRPM = fan_table_v2->ucFanMaxRPM * 100UL;



		phm_cap_set(hwmgr->platform_descriptor.platformCaps,

				PHM_PlatformCaps_MicrocodeFanControl);



		hwmgr->thermal_controller.advanceFanControlParameters.usFanOutputSensitivity =

				le16_to_cpu(fan_table_v2->usFanOutputSensitivity);

		hwmgr->thermal_controller.advanceFanControlParameters.usMaxFanRPM =
@@ -366,6 +364,7 @@ static int get_tdp_table( 
	uint8_t sda;

	const ATOM_Vega10_PowerTune_Table *power_tune_table;

	const ATOM_Vega10_PowerTune_Table_V2 *power_tune_table_v2;

	const ATOM_Vega10_PowerTune_Table_V3 *power_tune_table_v3;



	table_size = sizeof(uint32_t) + sizeof(struct phm_tdp_table);
@@ -408,7 +407,7 @@ static int get_tdp_table( 
		tdp_table->ucPlx_I2C_Line = power_tune_table->ucPlx_I2C_LineSCL;

		tdp_table->ucPlx_I2C_LineSDA = power_tune_table->ucPlx_I2C_LineSDA;

		hwmgr->platform_descriptor.LoadLineSlope = le16_to_cpu(power_tune_table->usLoadLineResistance);

	} else {

	} else if (table->ucRevId == 6) {

		power_tune_table_v2 = (ATOM_Vega10_PowerTune_Table_V2 *)table;

		tdp_table->usMaximumPowerDeliveryLimit = le16_to_cpu(power_tune_table_v2->usSocketPowerLimit);

		tdp_table->usTDC = le16_to_cpu(power_tune_table_v2->usTdcLimit);
@@ -454,6 +453,47 @@ static int get_tdp_table( 


		hwmgr->platform_descriptor.LoadLineSlope =

					le16_to_cpu(power_tune_table_v2->usLoadLineResistance);

	} else {

		power_tune_table_v3 = (ATOM_Vega10_PowerTune_Table_V3 *)table;

		tdp_table->usMaximumPowerDeliveryLimit   = power_tune_table_v3->usSocketPowerLimit;

		tdp_table->usTDC                         = power_tune_table_v3->usTdcLimit;

		tdp_table->usEDCLimit                    = power_tune_table_v3->usEdcLimit;

		tdp_table->usSoftwareShutdownTemp        = power_tune_table_v3->usSoftwareShutdownTemp;

		tdp_table->usTemperatureLimitTedge       = power_tune_table_v3->usTemperatureLimitTedge;

		tdp_table->usTemperatureLimitHotspot     = power_tune_table_v3->usTemperatureLimitHotSpot;

		tdp_table->usTemperatureLimitLiquid1     = power_tune_table_v3->usTemperatureLimitLiquid1;

		tdp_table->usTemperatureLimitLiquid2     = power_tune_table_v3->usTemperatureLimitLiquid2;

		tdp_table->usTemperatureLimitHBM         = power_tune_table_v3->usTemperatureLimitHBM;

		tdp_table->usTemperatureLimitVrVddc      = power_tune_table_v3->usTemperatureLimitVrSoc;

		tdp_table->usTemperatureLimitVrMvdd      = power_tune_table_v3->usTemperatureLimitVrMem;

		tdp_table->usTemperatureLimitPlx         = power_tune_table_v3->usTemperatureLimitPlx;

		tdp_table->ucLiquid1_I2C_address         = power_tune_table_v3->ucLiquid1_I2C_address;

		tdp_table->ucLiquid2_I2C_address         = power_tune_table_v3->ucLiquid2_I2C_address;

		tdp_table->usBoostStartTemperature       = power_tune_table_v3->usBoostStartTemperature;

		tdp_table->usBoostStopTemperature        = power_tune_table_v3->usBoostStopTemperature;

		tdp_table->ulBoostClock                  = power_tune_table_v3->ulBoostClock;



		get_scl_sda_value(power_tune_table_v3->ucLiquid_I2C_Line, &scl, &sda);



		tdp_table->ucLiquid_I2C_Line             = scl;

		tdp_table->ucLiquid_I2C_LineSDA          = sda;



		tdp_table->ucVr_I2C_address              = power_tune_table_v3->ucVr_I2C_address;



		get_scl_sda_value(power_tune_table_v3->ucVr_I2C_Line, &scl, &sda);



		tdp_table->ucVr_I2C_Line                 = scl;

		tdp_table->ucVr_I2C_LineSDA              = sda;



		tdp_table->ucPlx_I2C_address             = power_tune_table_v3->ucPlx_I2C_address;



		get_scl_sda_value(power_tune_table_v3->ucPlx_I2C_Line, &scl, &sda);



		tdp_table->ucPlx_I2C_Line                = scl;

		tdp_table->ucPlx_I2C_LineSDA             = sda;



		hwmgr->platform_descriptor.LoadLineSlope =

					le16_to_cpu(power_tune_table_v3->usLoadLineResistance);

	}



	*info_tdp_table = tdp_table;

drivers/gpu/drm/amd/powerplay/inc/hwmgr.h

+3 −0
Original line number Diff line number Diff line
@@ -488,6 +488,9 @@ struct phm_tdp_table { 
	uint8_t  ucVr_I2C_LineSDA;

	uint8_t  ucPlx_I2C_LineSDA;

	uint32_t usBoostPowerLimit;

	uint16_t usBoostStartTemperature;

	uint16_t usBoostStopTemperature;

	uint32_t  ulBoostClock;

};



struct phm_ppm_table {