Commit 47f1724d authored by Mario Limonciello's avatar Mario Limonciello Committed by Alex Deucher
Browse files

drm/amd: Introduce `AMDGPU_PP_SENSOR_GPU_INPUT_POWER` 

Some GPUs have been overloading average power values and input power
values. To disambiguate these, introduce a new
`AMDGPU_PP_SENSOR_GPU_INPUT_POWER` and the GPUs that share input
power update to use this instead of average power.

Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2746


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 e94e787e

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

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ enum amd_pp_sensors { 
	AMDGPU_PP_SENSOR_VCE_POWER,

	AMDGPU_PP_SENSOR_UVD_POWER,

	AMDGPU_PP_SENSOR_GPU_POWER,

	AMDGPU_PP_SENSOR_GPU_INPUT_POWER,

	AMDGPU_PP_SENSOR_SS_APU_SHARE,

	AMDGPU_PP_SENSOR_SS_DGPU_SHARE,

	AMDGPU_PP_SENSOR_STABLE_PSTATE_SCLK,

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

+1 −1
Original line number Diff line number Diff line
@@ -2809,7 +2809,7 @@ static ssize_t amdgpu_hwmon_show_power_input(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_INPUT_POWER);

	if (val < 0)

		return val;

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

+1 −1
Original line number Diff line number Diff line
@@ -4039,7 +4039,7 @@ static int smu7_read_sensor(struct pp_hwmgr *hwmgr, int idx, 
		*((uint32_t *)value) = data->vce_power_gated ? 0 : 1;

		*size = 4;

		return 0;

	case AMDGPU_PP_SENSOR_GPU_POWER:

	case AMDGPU_PP_SENSOR_GPU_INPUT_POWER:

		return smu7_get_gpu_power(hwmgr, (uint32_t *)value);

	case AMDGPU_PP_SENSOR_VDDGFX:

		if ((data->vr_config & VRCONF_VDDGFX_MASK) ==

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

+1 −1
Original line number Diff line number Diff line
@@ -3966,7 +3966,7 @@ static int vega10_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_INPUT_POWER:

		ret = vega10_get_gpu_power(hwmgr, (uint32_t *)value);

		break;

	case AMDGPU_PP_SENSOR_VDDGFX:

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

+1 −1
Original line number Diff line number Diff line
@@ -1529,7 +1529,7 @@ static int vega12_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_INPUT_POWER:

		ret = vega12_get_gpu_power(hwmgr, (uint32_t *)value);

		if (!ret)

			*size = 4;