Commit de4b7cd8 authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher
Browse files

drm/amd/pm/swsmu: unify the init soft gpu metrics function 



the soft gpu metrics is not asic related data structure.
unify them to reduce duplicate code.

Signed-off-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1001f2a1

drivers/gpu/drm/amd/pm/inc/smu_v11_0.h

+0 −4
Original line number Diff line number Diff line
@@ -272,10 +272,6 @@ int smu_v11_0_get_current_pcie_link_speed_level(struct smu_context *smu); 


int smu_v11_0_get_current_pcie_link_speed(struct smu_context *smu);



void smu_v11_0_init_gpu_metrics_v1_0(struct gpu_metrics_v1_0 *gpu_metrics);



void smu_v11_0_init_gpu_metrics_v2_0(struct gpu_metrics_v2_0 *gpu_metrics);



int smu_v11_0_gfx_ulv_control(struct smu_context *smu,

			      bool enablement);

drivers/gpu/drm/amd/pm/inc/smu_v12_0.h

+0 −2
Original line number Diff line number Diff line
@@ -60,7 +60,5 @@ int smu_v12_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_ 


int smu_v12_0_set_driver_table_location(struct smu_context *smu);



void smu_v12_0_init_gpu_metrics_v2_0(struct gpu_metrics_v2_0 *gpu_metrics);



#endif

#endif

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

+3 −1
Original line number Diff line number Diff line
@@ -2239,7 +2239,7 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, 
	if (ret)

		return ret;



	smu_v11_0_init_gpu_metrics_v1_0(gpu_metrics);

	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 0);



	gpu_metrics->temperature_edge = metrics.TemperatureEdge;

	gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -2276,6 +2276,8 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->pcie_link_speed =

			arcturus_get_current_pcie_link_speed(smu);



	gpu_metrics->system_clock_counter = ktime_get_boottime_ns();



	*table = (void *)gpu_metrics;



	return sizeof(struct gpu_metrics_v1_0);

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

+3 −1
Original line number Diff line number Diff line
@@ -2314,7 +2314,7 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, 


	mutex_unlock(&smu->metrics_lock);



	smu_v11_0_init_gpu_metrics_v1_0(gpu_metrics);

	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 0);



	gpu_metrics->temperature_edge = metrics.TemperatureEdge;

	gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -2354,6 +2354,8 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->pcie_link_speed =

			smu_v11_0_get_current_pcie_link_speed(smu);



	gpu_metrics->system_clock_counter = ktime_get_boottime_ns();



	*table = (void *)gpu_metrics;



	return sizeof(struct gpu_metrics_v1_0);

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

+3 −1
Original line number Diff line number Diff line
@@ -2958,7 +2958,7 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, 
	if (ret)

		return ret;



	smu_v11_0_init_gpu_metrics_v1_0(gpu_metrics);

	smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 0);



	gpu_metrics->temperature_edge = metrics->TemperatureEdge;

	gpu_metrics->temperature_hotspot = metrics->TemperatureHotspot;
@@ -3001,6 +3001,8 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, 
	gpu_metrics->pcie_link_speed =

			smu_v11_0_get_current_pcie_link_speed(smu);



	gpu_metrics->system_clock_counter = ktime_get_boottime_ns();



	*table = (void *)gpu_metrics;



	return sizeof(struct gpu_metrics_v1_0);