Commit 60e317a2 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/swsmu/sienna_cichlid: simplify sensor handling 



Just query the metrics table directly rather than going through
an extra level of functions.

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

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

+24 −74
Original line number Diff line number Diff line
@@ -1119,44 +1119,6 @@ static int sienna_cichlid_display_config_changed(struct smu_context *smu) 
	return ret;

}



static int sienna_cichlid_get_gpu_power(struct smu_context *smu, uint32_t *value)

{

	if (!value)

		return -EINVAL;



	return sienna_cichlid_get_smu_metrics_data(smu,

						   METRICS_AVERAGE_SOCKETPOWER,

						   value);

}



static int sienna_cichlid_get_current_activity_percent(struct smu_context *smu,

					       enum amd_pp_sensors sensor,

					       uint32_t *value)

{

	int ret = 0;



	if (!value)

		return -EINVAL;



	switch (sensor) {

	case AMDGPU_PP_SENSOR_GPU_LOAD:

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_AVERAGE_GFXACTIVITY,

							  value);

		break;

	case AMDGPU_PP_SENSOR_MEM_LOAD:

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_AVERAGE_MEMACTIVITY,

							  value);

		break;

	default:

		dev_err(smu->adev->dev, "Invalid sensor for retrieving clock activity\n");

		return -EINVAL;

	}



	return ret;

}



static bool sienna_cichlid_is_dpm_running(struct smu_context *smu)

{

	int ret = 0;
@@ -1468,39 +1430,6 @@ static int sienna_cichlid_set_watermarks_table(struct smu_context *smu, 
	return 0;

}



static int sienna_cichlid_thermal_get_temperature(struct smu_context *smu,

					     enum amd_pp_sensors sensor,

					     uint32_t *value)

{

	int ret = 0;



	if (!value)

		return -EINVAL;



	switch (sensor) {

	case AMDGPU_PP_SENSOR_HOTSPOT_TEMP:

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_TEMPERATURE_HOTSPOT,

							  value);

		break;

	case AMDGPU_PP_SENSOR_EDGE_TEMP:

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_TEMPERATURE_EDGE,

							  value);

		break;

	case AMDGPU_PP_SENSOR_MEM_TEMP:

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_TEMPERATURE_MEM,

							  value);

		break;

	default:

		dev_err(smu->adev->dev, "Invalid sensor for retrieving temp\n");

		return -EINVAL;

	}



	return ret;

}



static int sienna_cichlid_read_sensor(struct smu_context *smu,

				 enum amd_pp_sensors sensor,

				 void *data, uint32_t *size)
@@ -1519,18 +1448,39 @@ static int sienna_cichlid_read_sensor(struct smu_context *smu, 
		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_MEM_LOAD:

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_AVERAGE_MEMACTIVITY,

							  (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GPU_LOAD:

		ret = sienna_cichlid_get_current_activity_percent(smu, sensor, (uint32_t *)data);

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_AVERAGE_GFXACTIVITY,

							  (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GPU_POWER:

		ret = sienna_cichlid_get_gpu_power(smu, (uint32_t *)data);

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_AVERAGE_SOCKETPOWER,

							  (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_HOTSPOT_TEMP:

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_TEMPERATURE_HOTSPOT,

							  (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_EDGE_TEMP:

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_TEMPERATURE_EDGE,

							  (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_MEM_TEMP:

		ret = sienna_cichlid_thermal_get_temperature(smu, sensor, (uint32_t *)data);

		ret = sienna_cichlid_get_smu_metrics_data(smu,

							  METRICS_TEMPERATURE_MEM,

							  (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GFX_MCLK: