Attachment 118978 Details for Bug 92524 – possible fix

[patch] possible fix

0001-drm-radeon-dpm-don-t-add-pwm-attributes-if-DPM-is-di.patch (text/plain), 1.57 KB, created by Alex Deucher on 2015-10-19 13:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2015-10-19 13:34:17 UTC

Size: 1.57 KB

patch

obsolete

>From 28d9849697689c51dc70d00f9cdf3988e44931d7 Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 19 Oct 2015 09:30:42 -0400
>Subject: [PATCH] drm/radeon/dpm: don't add pwm attributes if DPM is disabled
>
>PWM fan control is only available with DPM.  If DPM disabled,
>don't expose the PWM fan controls to avoid a crash.
>
>Bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=92524
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/radeon/radeon_pm.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
>index 10f4c12..c590a87 100644
>--- a/drivers/gpu/drm/radeon/radeon_pm.c
>+++ b/drivers/gpu/drm/radeon/radeon_pm.c
>@@ -717,10 +717,14 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj,
> 	struct radeon_device *rdev = dev_get_drvdata(dev);
> 	umode_t effective_mode = attr->mode;
> 
>-	/* Skip limit attributes if DPM is not enabled */
>+	/* Skip attributes if DPM is not enabled */
> 	if (rdev->pm.pm_method != PM_METHOD_DPM &&
> 	    (attr == &sensor_dev_attr_temp1_crit.dev_attr.attr ||
>-	     attr == &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr))
>+	     attr == &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr ||
>+	     attr == &sensor_dev_attr_pwm1.dev_attr.attr ||
>+	     attr == &sensor_dev_attr_pwm1_enable.dev_attr.attr ||
>+	     attr == &sensor_dev_attr_pwm1_max.dev_attr.attr ||
>+	     attr == &sensor_dev_attr_pwm1_min.dev_attr.attr))
> 		return 0;
> 
> 	/* Skip fan attributes if fan is not present */
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 92524: 118963 | 118964 | 118978 | 118987

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.