Commit 9dc8d07c authored by Asad Kamal's avatar Asad Kamal Committed by Alex Deucher
Browse files

drm/amd/pm: Remove power2_average node 



SOC power consumption is reported by power1_average.
power2_cap_default/min/max only represent second level limits
and don't represent a different type of power or power consumption
by a subsection of the SOC. Therefore power2_average does not serve any
purpose and hence removing power2_average sysfs node

Signed-off-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent af2e61d6

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

+1 −4
Original line number Diff line number Diff line
@@ -3579,7 +3579,6 @@ static SENSOR_DEVICE_ATTR(power1_cap_min, S_IRUGO, amdgpu_hwmon_show_power_cap_m 
static SENSOR_DEVICE_ATTR(power1_cap, S_IRUGO | S_IWUSR, amdgpu_hwmon_show_power_cap, amdgpu_hwmon_set_power_cap, 0);

static SENSOR_DEVICE_ATTR(power1_cap_default, S_IRUGO, amdgpu_hwmon_show_power_cap_default, NULL, 0);

static SENSOR_DEVICE_ATTR(power1_label, S_IRUGO, amdgpu_hwmon_show_power_label, NULL, 0);

static SENSOR_DEVICE_ATTR(power2_average, S_IRUGO, amdgpu_hwmon_show_power_avg, NULL, 1);

static SENSOR_DEVICE_ATTR(power2_cap_max, S_IRUGO, amdgpu_hwmon_show_power_cap_max, NULL, 1);

static SENSOR_DEVICE_ATTR(power2_cap_min, S_IRUGO, amdgpu_hwmon_show_power_cap_min, NULL, 1);

static SENSOR_DEVICE_ATTR(power2_cap, S_IRUGO | S_IWUSR, amdgpu_hwmon_show_power_cap, amdgpu_hwmon_set_power_cap, 1);
@@ -3628,7 +3627,6 @@ static struct attribute *hwmon_attributes[] = { 
	&sensor_dev_attr_power1_cap.dev_attr.attr,

	&sensor_dev_attr_power1_cap_default.dev_attr.attr,

	&sensor_dev_attr_power1_label.dev_attr.attr,

	&sensor_dev_attr_power2_average.dev_attr.attr,

	&sensor_dev_attr_power2_cap_max.dev_attr.attr,

	&sensor_dev_attr_power2_cap_min.dev_attr.attr,

	&sensor_dev_attr_power2_cap.dev_attr.attr,
@@ -3827,8 +3825,7 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
		return 0;



	/* only Vangogh has fast PPT limit and power labels */

	if ((attr == &sensor_dev_attr_power2_average.dev_attr.attr ||

	     attr == &sensor_dev_attr_power2_cap_max.dev_attr.attr ||

	if ((attr == &sensor_dev_attr_power2_cap_max.dev_attr.attr ||

	     attr == &sensor_dev_attr_power2_cap_min.dev_attr.attr ||

	     attr == &sensor_dev_attr_power2_cap.dev_attr.attr ||

	     attr == &sensor_dev_attr_power2_cap_default.dev_attr.attr ||