Commit 8ca78a0a authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

drm/amd/powerplay: add Sienna Cichlid support for gpu metrics export 



Add Sienna Cichlid gpu metrics export interface.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6d4ff50a

drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c

+89 −2
Original line number Diff line number Diff line
@@ -385,14 +385,26 @@ static int sienna_cichlid_tables_init(struct smu_context *smu) 


	smu_table->metrics_table = kzalloc(sizeof(SmuMetrics_t), GFP_KERNEL);

	if (!smu_table->metrics_table)

		return -ENOMEM;

		goto err0_out;

	smu_table->metrics_time = 0;



	smu_table->gpu_metrics_table_size = sizeof(struct gpu_metrics_v1_0);

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

	if (!smu_table->gpu_metrics_table)

		goto err1_out;



	smu_table->watermarks_table = kzalloc(sizeof(Watermarks_t), GFP_KERNEL);

	if (!smu_table->watermarks_table)

		return -ENOMEM;

		goto err2_out;



	return 0;



err2_out:

	kfree(smu_table->gpu_metrics_table);

err1_out:

	kfree(smu_table->metrics_table);

err0_out:

	return -ENOMEM;

}



static int sienna_cichlid_get_smu_metrics_data(struct smu_context *smu,
@@ -2649,6 +2661,80 @@ static void sienna_cichlid_i2c_control_fini(struct smu_context *smu, struct i2c_ 
	i2c_del_adapter(control);

}



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_0 *gpu_metrics =

		(struct gpu_metrics_v1_0 *)smu_table->gpu_metrics_table;

	SmuMetrics_t metrics;

	int ret = 0;



	mutex_lock(&smu->metrics_lock);



	ret = smu_cmn_update_table(smu,

				   SMU_TABLE_SMU_METRICS,

				   0,

				   smu_table->metrics_table,

				   false);

	if (ret) {

		dev_info(smu->adev->dev, "Failed to export SMU metrics table!\n");

		mutex_unlock(&smu->metrics_lock);

		return ret;

	}

	smu_table->metrics_time = jiffies;



	memcpy(&metrics, smu_table->metrics_table, sizeof(SmuMetrics_t));



	mutex_unlock(&smu->metrics_lock);



	smu_v11_0_init_gpu_metrics_v1_0(gpu_metrics);



	gpu_metrics->temperature_edge = metrics.TemperatureEdge;

	gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;

	gpu_metrics->temperature_mem = metrics.TemperatureMem;

	gpu_metrics->temperature_vrgfx = metrics.TemperatureVrGfx;

	gpu_metrics->temperature_vrsoc = metrics.TemperatureVrSoc;

	gpu_metrics->temperature_vrmem = metrics.TemperatureVrMem0;



	gpu_metrics->average_gfx_activity = metrics.AverageGfxActivity;

	gpu_metrics->average_umc_activity = metrics.AverageUclkActivity;

	gpu_metrics->average_mm_activity = metrics.VcnActivityPercentage;



	gpu_metrics->average_socket_power = metrics.AverageSocketPower;

	gpu_metrics->energy_accumulator = metrics.EnergyAccumulator;



	if (metrics.AverageGfxActivity <= SMU_11_0_7_GFX_BUSY_THRESHOLD)

		gpu_metrics->average_gfxclk_frequency = metrics.AverageGfxclkFrequencyPostDs;

	else

		gpu_metrics->average_gfxclk_frequency = metrics.AverageGfxclkFrequencyPreDs;

	gpu_metrics->average_uclk_frequency = metrics.AverageUclkFrequencyPostDs;

	gpu_metrics->average_vclk0_frequency = metrics.AverageVclk0Frequency;

	gpu_metrics->average_dclk0_frequency = metrics.AverageDclk0Frequency;

	gpu_metrics->average_vclk1_frequency = metrics.AverageVclk1Frequency;

	gpu_metrics->average_dclk1_frequency = metrics.AverageDclk1Frequency;



	gpu_metrics->current_gfxclk = metrics.CurrClock[PPCLK_GFXCLK];

	gpu_metrics->current_socclk = metrics.CurrClock[PPCLK_SOCCLK];

	gpu_metrics->current_uclk = metrics.CurrClock[PPCLK_UCLK];

	gpu_metrics->current_vclk0 = metrics.CurrClock[PPCLK_VCLK_0];

	gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK_0];

	gpu_metrics->current_vclk1 = metrics.CurrClock[PPCLK_VCLK_1];

	gpu_metrics->current_dclk1 = metrics.CurrClock[PPCLK_DCLK_1];



	gpu_metrics->throttle_status = metrics.ThrottlerStatus;



	gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;



	gpu_metrics->pcie_link_width =

			smu_v11_0_get_current_pcie_link_width(smu);

	gpu_metrics->pcie_link_speed =

			smu_v11_0_get_current_pcie_link_speed(smu);



	*table = (void *)gpu_metrics;



	return sizeof(struct gpu_metrics_v1_0);

}



static const struct pptable_funcs sienna_cichlid_ppt_funcs = {

	.get_allowed_feature_mask = sienna_cichlid_get_allowed_feature_mask,
@@ -2726,6 +2812,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { 
	.set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range,

	.get_pp_feature_mask = smu_cmn_get_pp_feature_mask,

	.set_pp_feature_mask = smu_cmn_set_pp_feature_mask,

	.get_gpu_metrics = sienna_cichlid_get_gpu_metrics,

};



void sienna_cichlid_set_ppt_funcs(struct smu_context *smu)