Commit 9366c2e8 authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Rename AMDGPU_PP_SENSOR_GPU_POWER 



Use the clearer name `AMDGPU_PP_SENSOR_GPU_AVG_POWER` instead.

Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 765bbbec

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
		case AMDGPU_INFO_SENSOR_GPU_AVG_POWER:

			/* get average GPU power */

			if (amdgpu_dpm_read_sensor(adev,

						   AMDGPU_PP_SENSOR_GPU_POWER,

						   AMDGPU_PP_SENSOR_GPU_AVG_POWER,

						   (void *)&ui32, &ui32_size)) {

				return -EINVAL;

			}

drivers/gpu/drm/amd/include/kgd_pp_interface.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ enum amd_pp_sensors { 
	AMDGPU_PP_SENSOR_MEM_TEMP,

	AMDGPU_PP_SENSOR_VCE_POWER,

	AMDGPU_PP_SENSOR_UVD_POWER,

	AMDGPU_PP_SENSOR_GPU_POWER,

	AMDGPU_PP_SENSOR_GPU_AVG_POWER,

	AMDGPU_PP_SENSOR_GPU_INPUT_POWER,

	AMDGPU_PP_SENSOR_SS_APU_SHARE,

	AMDGPU_PP_SENSOR_SS_DGPU_SHARE,

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -2796,7 +2796,7 @@ static ssize_t amdgpu_hwmon_show_power_avg(struct device *dev, 
{

	unsigned int val;



	val = amdgpu_hwmon_get_power(dev, AMDGPU_PP_SENSOR_GPU_POWER);

	val = amdgpu_hwmon_get_power(dev, AMDGPU_PP_SENSOR_GPU_AVG_POWER);

	if (val < 0)

		return val;
@@ -3460,7 +3460,7 @@ static int amdgpu_debugfs_pm_info_pp(struct seq_file *m, struct amdgpu_device *a 
	if (!amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_VDDNB, (void *)&value, &size))

		seq_printf(m, "\t%u mV (VDDNB)\n", value);

	size = sizeof(uint32_t);

	if (!amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GPU_POWER, (void *)&query, &size))

	if (!amdgpu_dpm_read_sensor(adev, AMDGPU_PP_SENSOR_GPU_AVG_POWER, (void *)&query, &size))

		seq_printf(m, "\t%u.%u W (average GPU)\n", query >> 8, query & 0xff);

	size = sizeof(value);

	seq_printf(m, "\n");

drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c

+2 −2
Original line number Diff line number Diff line
@@ -2141,7 +2141,7 @@ static int vega20_get_gpu_power(struct pp_hwmgr *hwmgr, int idx, 


	/* For the 40.46 release, they changed the value name */

	switch (idx) {

	case AMDGPU_PP_SENSOR_GPU_POWER:

	case AMDGPU_PP_SENSOR_GPU_AVG_POWER:

		if (hwmgr->smu_version == 0x282e00)

			*query = metrics_table.AverageSocketPower << 8;

		else
@@ -2260,7 +2260,7 @@ static int vega20_read_sensor(struct pp_hwmgr *hwmgr, int idx, 
		*((uint32_t *)value) = data->vce_power_gated ? 0 : 1;

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GPU_POWER:

	case AMDGPU_PP_SENSOR_GPU_AVG_POWER:

	case AMDGPU_PP_SENSOR_GPU_INPUT_POWER:

		*size = 16;

		ret = vega20_get_gpu_power(hwmgr, idx, (uint32_t *)value);

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

+1 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ static int arcturus_read_sensor(struct smu_context *smu, 
						    (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_GPU_POWER:

	case AMDGPU_PP_SENSOR_GPU_AVG_POWER:

		ret = arcturus_get_smu_metrics_data(smu,

						    METRICS_AVERAGE_SOCKETPOWER,

						    (uint32_t *)data);