Patch "drm/radeon/dpm: don't add pwm attributes if DPM is disabled" has been added to the 4.2-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/radeon/dpm: don't add pwm attributes if DPM is disabled
to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch
and it can be found in the queue-4.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
2a7d44f47f53fa1be677f44c73d78b1bcf9c05d9Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Mon, 19 Oct 2015 09:30:42 -0400
Subject: drm/radeon/dpm: don't add pwm attributes if DPM is disabled
From: Alex Deucher <[email protected]>
commit 2a7d44f47f53fa1be677f44c73d78b1bcf9c05d9 upstream.
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
--- drivers/gpu/drm/radeon/radeon_pm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_pm.c +6 -2
@@ -720,10 +720,14 @@ static umode_t hwmon_attributes_visible(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 */
Patches currently in stable-queue which might be from [email protected] are
queue-4.2/drm-radeon-move-bl-encoder-assignment-into-bl-init.patch queue-4.2/drm-amdgpu-add-missing-dpm-check-for-kv-dpm-late-init.patch queue-4.2/drm-radeon-fix-dpms-when-driver-backlight-control-is-disabled.patch queue-4.2/drm-amdgpu-don-t-try-to-recreate-sysfs-entries-on-resume.patch queue-4.2/drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch queue-4.2/drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch