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

drm/amd/pm: Add vangogh throttler translation 



Perform dependent to independent throttle status translation
for vangogh.

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 f06d9511

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

+29 −9
Original line number Diff line number Diff line
@@ -190,6 +190,20 @@ static struct cmn2asic_mapping vangogh_workload_map[PP_SMC_POWER_PROFILE_COUNT] 
	WORKLOAD_MAP(PP_SMC_POWER_PROFILE_CUSTOM,		WORKLOAD_PPLIB_CUSTOM_BIT),

};



static const uint8_t vangogh_throttler_map[] = {

	[THROTTLER_STATUS_BIT_SPL]	= (SMU_THROTTLER_SPL_BIT),

	[THROTTLER_STATUS_BIT_FPPT]	= (SMU_THROTTLER_FPPT_BIT),

	[THROTTLER_STATUS_BIT_SPPT]	= (SMU_THROTTLER_SPPT_BIT),

	[THROTTLER_STATUS_BIT_SPPT_APU]	= (SMU_THROTTLER_SPPT_APU_BIT),

	[THROTTLER_STATUS_BIT_THM_CORE]	= (SMU_THROTTLER_TEMP_CORE_BIT),

	[THROTTLER_STATUS_BIT_THM_GFX]	= (SMU_THROTTLER_TEMP_GPU_BIT),

	[THROTTLER_STATUS_BIT_THM_SOC]	= (SMU_THROTTLER_TEMP_SOC_BIT),

	[THROTTLER_STATUS_BIT_TDC_VDD]	= (SMU_THROTTLER_TDC_VDD_BIT),

	[THROTTLER_STATUS_BIT_TDC_SOC]	= (SMU_THROTTLER_TDC_SOC_BIT),

	[THROTTLER_STATUS_BIT_TDC_GFX]	= (SMU_THROTTLER_TDC_GFX_BIT),

	[THROTTLER_STATUS_BIT_TDC_CVIP]	= (SMU_THROTTLER_TDC_CVIP_BIT),

};



static int vangogh_tables_init(struct smu_context *smu)

{

	struct smu_table_context *smu_table = &smu->smu_table;
@@ -226,7 +240,7 @@ static int vangogh_tables_init(struct smu_context *smu) 
		goto err0_out;

	smu_table->metrics_time = 0;



	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_1);

	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v2_2);

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

	if (!smu_table->gpu_metrics_table)

		goto err1_out;
@@ -1632,8 +1646,8 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, 
				      void **table)

{

	struct smu_table_context *smu_table = &smu->smu_table;

	struct gpu_metrics_v2_1 *gpu_metrics =

		(struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table;

	struct gpu_metrics_v2_2 *gpu_metrics =

		(struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;

	SmuMetrics_legacy_t metrics;

	int ret = 0;
@@ -1641,7 +1655,7 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, 
	if (ret)

		return ret;



	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 2, 1);

	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 2, 2);



	gpu_metrics->temperature_gfx = metrics.GfxTemperature;

	gpu_metrics->temperature_soc = metrics.SocTemperature;
@@ -1674,20 +1688,23 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->current_l3clk[0] = metrics.L3Frequency[0];



	gpu_metrics->throttle_status = metrics.ThrottlerStatus;

	gpu_metrics->indep_throttle_status =

			smu_cmn_get_indep_throttler_status(metrics.ThrottlerStatus,

							   vangogh_throttler_map);



	gpu_metrics->system_clock_counter = ktime_get_boottime_ns();



	*table = (void *)gpu_metrics;



	return sizeof(struct gpu_metrics_v2_1);

	return sizeof(struct gpu_metrics_v2_2);

}



static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu,

				      void **table)

{

	struct smu_table_context *smu_table = &smu->smu_table;

	struct gpu_metrics_v2_1 *gpu_metrics =

		(struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table;

	struct gpu_metrics_v2_2 *gpu_metrics =

		(struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;

	SmuMetrics_t metrics;

	int ret = 0;
@@ -1695,7 +1712,7 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, 
	if (ret)

		return ret;



	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 2, 1);

	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 2, 2);



	gpu_metrics->temperature_gfx = metrics.Current.GfxTemperature;

	gpu_metrics->temperature_soc = metrics.Current.SocTemperature;
@@ -1735,12 +1752,15 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->current_l3clk[0] = metrics.Current.L3Frequency[0];



	gpu_metrics->throttle_status = metrics.Current.ThrottlerStatus;

	gpu_metrics->indep_throttle_status =

			smu_cmn_get_indep_throttler_status(metrics.Current.ThrottlerStatus,

							   vangogh_throttler_map);



	gpu_metrics->system_clock_counter = ktime_get_boottime_ns();



	*table = (void *)gpu_metrics;



	return sizeof(struct gpu_metrics_v2_1);

	return sizeof(struct gpu_metrics_v2_2);

}



static ssize_t vangogh_common_get_gpu_metrics(struct smu_context *smu,