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

drm/amd: Add a new hwmon attribute for instantaneous power 



Some GPUs provide support for current power, some average power,
and some both.  To be able to support all these combinations,
introduce a new attribute.

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 d117fd29

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

+17 −0
Original line number Diff line number Diff line
@@ -2803,6 +2803,19 @@ static ssize_t amdgpu_hwmon_show_power_avg(struct device *dev, 
	return sysfs_emit(buf, "%u\n", val);

}



static ssize_t amdgpu_hwmon_show_power_input(struct device *dev,

					     struct device_attribute *attr,

					     char *buf)

{

	unsigned int val;



	val = amdgpu_hwmon_get_power(dev, AMDGPU_PP_SENSOR_GPU_POWER);

	if (val < 0)

		return val;



	return sysfs_emit(buf, "%u\n", val);

}



static ssize_t amdgpu_hwmon_show_power_cap_min(struct device *dev,

					 struct device_attribute *attr,

					 char *buf)
@@ -3023,6 +3036,8 @@ static ssize_t amdgpu_hwmon_show_mclk_label(struct device *dev, 
 *

 * - power1_average: average power used by the SoC in microWatts.  On APUs this includes the CPU.

 *

 * - power1_input: instantaneous power used by the SoC in microWatts.  On APUs this includes the CPU.

 *

 * - power1_cap_min: minimum cap supported in microWatts

 *

 * - power1_cap_max: maximum cap supported in microWatts
@@ -3091,6 +3106,7 @@ static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO, amdgpu_hwmon_show_vddgfx_label, NU 
static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, amdgpu_hwmon_show_vddnb, NULL, 0);

static SENSOR_DEVICE_ATTR(in1_label, S_IRUGO, amdgpu_hwmon_show_vddnb_label, NULL, 0);

static SENSOR_DEVICE_ATTR(power1_average, S_IRUGO, amdgpu_hwmon_show_power_avg, NULL, 0);

static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, amdgpu_hwmon_show_power_input, NULL, 0);

static SENSOR_DEVICE_ATTR(power1_cap_max, S_IRUGO, amdgpu_hwmon_show_power_cap_max, NULL, 0);

static SENSOR_DEVICE_ATTR(power1_cap_min, S_IRUGO, amdgpu_hwmon_show_power_cap_min, NULL, 0);

static SENSOR_DEVICE_ATTR(power1_cap, S_IRUGO | S_IWUSR, amdgpu_hwmon_show_power_cap, amdgpu_hwmon_set_power_cap, 0);
@@ -3137,6 +3153,7 @@ static struct attribute *hwmon_attributes[] = { 
	&sensor_dev_attr_in1_input.dev_attr.attr,

	&sensor_dev_attr_in1_label.dev_attr.attr,

	&sensor_dev_attr_power1_average.dev_attr.attr,

	&sensor_dev_attr_power1_input.dev_attr.attr,

	&sensor_dev_attr_power1_cap_max.dev_attr.attr,

	&sensor_dev_attr_power1_cap_min.dev_attr.attr,

	&sensor_dev_attr_power1_cap.dev_attr.attr,