Commit 239873fc authored by Kevin Wang's avatar Kevin Wang Committed by Alex Deucher
Browse files

drm/amd/powerplay: hwmon don't check powerplay when sw smu is enabled 



when sw-smu is enabled, the driver won't init powerplay structure.

Signed-off-by: default avatarKevin Wang <kevin1.wang@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarLikun Gao <Likun.Gao@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f14a323d

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

+30 −26
Original line number Diff line number Diff line
@@ -2045,6 +2045,7 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
	     attr == &sensor_dev_attr_fan1_enable.dev_attr.attr))

		return 0;



	if (!is_support_sw_smu(adev)) {

		/* mask fan attributes if we have no bindings for this asic to expose */

		if ((!adev->powerplay.pp_funcs->get_fan_speed_percent &&

		     attr == &sensor_dev_attr_pwm1.dev_attr.attr) || /* can't query fan */
@@ -2057,6 +2058,7 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
		    (!adev->powerplay.pp_funcs->set_fan_control_mode &&

		     attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr)) /* can't manage state */

			effective_mode &= ~S_IWUSR;

	}



	if ((adev->flags & AMD_IS_APU) &&

	    (attr == &sensor_dev_attr_power1_average.dev_attr.attr ||
@@ -2065,6 +2067,7 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
	     attr == &sensor_dev_attr_power1_cap.dev_attr.attr))

		return 0;



	if (!is_support_sw_smu(adev)) {

		/* hide max/min values if we can't both query and manage the fan */

		if ((!adev->powerplay.pp_funcs->set_fan_speed_percent &&

		     !adev->powerplay.pp_funcs->get_fan_speed_percent) &&
@@ -2079,6 +2082,7 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
		    (attr == &sensor_dev_attr_fan1_max.dev_attr.attr ||

		     attr == &sensor_dev_attr_fan1_min.dev_attr.attr))

			return 0;

	}



	/* only APUs have vddnb */

	if (!(adev->flags & AMD_IS_APU) &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE