Commit f06d9511 authored by Graham Sider's avatar Graham Sider Committed by Alex Deucher
Browse files

drm/amd/pm: Add sienna cichlid throttler translation 



Perform dependent to independent throttle status translation
for sienna cichlid.

Signed-off-by: default avatarGraham Sider <Graham.Sider@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 64cdee43

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

+29 −5
Original line number Diff line number Diff line
@@ -239,6 +239,27 @@ static struct cmn2asic_mapping sienna_cichlid_workload_map[PP_SMC_POWER_PROFILE_ 
	WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM,		WORKLOAD_PPLIB_CUSTOM_BIT),

};



static const uint8_t sienna_cichlid_throttler_map[] = {

	[THROTTLER_TEMP_EDGE_BIT]	= (SMU_THROTTLER_TEMP_EDGE_BIT),

	[THROTTLER_TEMP_HOTSPOT_BIT]	= (SMU_THROTTLER_TEMP_HOTSPOT_BIT),

	[THROTTLER_TEMP_MEM_BIT]	= (SMU_THROTTLER_TEMP_MEM_BIT),

	[THROTTLER_TEMP_VR_GFX_BIT]	= (SMU_THROTTLER_TEMP_VR_GFX_BIT),

	[THROTTLER_TEMP_VR_MEM0_BIT]	= (SMU_THROTTLER_TEMP_VR_MEM0_BIT),

	[THROTTLER_TEMP_VR_MEM1_BIT]	= (SMU_THROTTLER_TEMP_VR_MEM1_BIT),

	[THROTTLER_TEMP_VR_SOC_BIT]	= (SMU_THROTTLER_TEMP_VR_SOC_BIT),

	[THROTTLER_TEMP_LIQUID0_BIT]	= (SMU_THROTTLER_TEMP_LIQUID0_BIT),

	[THROTTLER_TEMP_LIQUID1_BIT]	= (SMU_THROTTLER_TEMP_LIQUID1_BIT),

	[THROTTLER_TDC_GFX_BIT]		= (SMU_THROTTLER_TDC_GFX_BIT),

	[THROTTLER_TDC_SOC_BIT]		= (SMU_THROTTLER_TDC_SOC_BIT),

	[THROTTLER_PPT0_BIT]		= (SMU_THROTTLER_PPT0_BIT),

	[THROTTLER_PPT1_BIT]		= (SMU_THROTTLER_PPT1_BIT),

	[THROTTLER_PPT2_BIT]		= (SMU_THROTTLER_PPT2_BIT),

	[THROTTLER_PPT3_BIT]		= (SMU_THROTTLER_PPT3_BIT),

	[THROTTLER_FIT_BIT]		= (SMU_THROTTLER_FIT_BIT),

	[THROTTLER_PPM_BIT]		= (SMU_THROTTLER_PPM_BIT),

	[THROTTLER_APCC_BIT]		= (SMU_THROTTLER_APCC_BIT),

};



static int

sienna_cichlid_get_allowed_feature_mask(struct smu_context *smu,

				  uint32_t *feature_mask, uint32_t num)
@@ -449,7 +470,7 @@ static int sienna_cichlid_tables_init(struct smu_context *smu) 
		goto err0_out;

	smu_table->metrics_time = 0;



	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_1);

	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_3);

	smu_table->gpu_metrics_table = kzalloc(smu_table->gpu_metrics_table_size, GFP_KERNEL);

	if (!smu_table->gpu_metrics_table)

		goto err1_out;
@@ -3620,8 +3641,8 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, 
					      void **table)

{

	struct smu_table_context *smu_table = &smu->smu_table;

	struct gpu_metrics_v1_1 *gpu_metrics =

		(struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table;

	struct gpu_metrics_v1_3 *gpu_metrics =

		(struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;

	SmuMetricsExternal_t metrics_external;

	SmuMetrics_t *metrics =

		&(metrics_external.SmuMetrics);
@@ -3635,7 +3656,7 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, 
	if (ret)

		return ret;



	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 1);

	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 3);



	gpu_metrics->temperature_edge = metrics->TemperatureEdge;

	gpu_metrics->temperature_hotspot = metrics->TemperatureHotspot;
@@ -3670,6 +3691,9 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->current_dclk1 = metrics->CurrClock[PPCLK_DCLK_1];



	gpu_metrics->throttle_status = metrics->ThrottlerStatus;

	gpu_metrics->indep_throttle_status =

			smu_cmn_get_indep_throttler_status(metrics->ThrottlerStatus,

							   sienna_cichlid_throttler_map);



	gpu_metrics->current_fan_speed = metrics->CurrFanSpeed;
@@ -3692,7 +3716,7 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, 


	*table = (void *)gpu_metrics;



	return sizeof(struct gpu_metrics_v1_1);

	return sizeof(struct gpu_metrics_v1_3);

}



static int sienna_cichlid_enable_mgpu_fan_boost(struct smu_context *smu)