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

drm/amd/pm: Add arcturus throttler translation 



Perform dependent to independent throttle status translation
for arcturus.

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 c23083cd

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

+28 −5
Original line number Diff line number Diff line
@@ -211,6 +211,26 @@ static const struct cmn2asic_mapping arcturus_workload_map[PP_SMC_POWER_PROFILE_ 
	WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM,		WORKLOAD_PPLIB_CUSTOM_BIT),

};



static const uint8_t arcturus_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_MEM_BIT]	= (SMU_THROTTLER_TEMP_VR_MEM0_BIT),

	[THROTTLER_TEMP_VR_SOC_BIT]	= (SMU_THROTTLER_TEMP_VR_SOC_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_PPM_BIT]		= (SMU_THROTTLER_PPM_BIT),

	[THROTTLER_FIT_BIT]		= (SMU_THROTTLER_FIT_BIT),

	[THROTTLER_APCC_BIT]		= (SMU_THROTTLER_APCC_BIT),

	[THROTTLER_VRHOT0_BIT]		= (SMU_THROTTLER_VRHOT0_BIT),

	[THROTTLER_VRHOT1_BIT]		= (SMU_THROTTLER_VRHOT1_BIT),

};



static int arcturus_tables_init(struct smu_context *smu)

{

	struct smu_table_context *smu_table = &smu->smu_table;
@@ -237,7 +257,7 @@ static int arcturus_tables_init(struct smu_context *smu) 
		return -ENOMEM;

	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) {

		kfree(smu_table->metrics_table);
@@ -2278,8 +2298,8 @@ static ssize_t arcturus_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;

	SmuMetrics_t metrics;

	int ret = 0;
@@ -2289,7 +2309,7 @@ static ssize_t arcturus_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;
@@ -2318,6 +2338,9 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];



	gpu_metrics->throttle_status = metrics.ThrottlerStatus;

	gpu_metrics->indep_throttle_status =

			smu_cmn_get_indep_throttler_status(metrics.ThrottlerStatus,

							   arcturus_throttler_map);



	gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2330,7 +2353,7 @@ static ssize_t arcturus_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 const struct pptable_funcs arcturus_ppt_funcs = {