From e0142a3a4c4ae3f4da68a5eaab54d9948fe3eeaf Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 5 Nov 2015 21:39:05 -0800 Subject: [PATCH] fix 3.14 build --- ...-to-recreate-sysfs-entries-on-resume.patch | 6 +-- ...dd-pwm-attributes-if-dpm-is-disabled.patch | 41 ------------------- queue-3.14/series | 7 ++-- 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 queue-3.14/drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch diff --git a/queue-3.14/drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch b/queue-3.14/drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch index 2e724bda282..6a0c2f52d5a 100644 --- a/queue-3.14/drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch +++ b/queue-3.14/drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c -@@ -1354,19 +1354,23 @@ int radeon_pm_late_init(struct radeon_de +@@ -1350,19 +1350,23 @@ int radeon_pm_late_init(struct radeon_de if (rdev->pm.pm_method == PM_METHOD_DPM) { if (rdev->pm.dpm_enabled) { @@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman mutex_lock(&rdev->pm.mutex); ret = radeon_dpm_late_enable(rdev); -@@ -1382,7 +1386,8 @@ int radeon_pm_late_init(struct radeon_de +@@ -1378,7 +1382,8 @@ int radeon_pm_late_init(struct radeon_de } } } else { @@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman /* where's the best place to put these? */ ret = device_create_file(rdev->dev, &dev_attr_power_profile); if (ret) -@@ -1390,6 +1395,8 @@ int radeon_pm_late_init(struct radeon_de +@@ -1386,6 +1391,8 @@ int radeon_pm_late_init(struct radeon_de ret = device_create_file(rdev->dev, &dev_attr_power_method); if (ret) DRM_ERROR("failed to create device file for power method\n"); diff --git a/queue-3.14/drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch b/queue-3.14/drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch deleted file mode 100644 index 8848a85a9d5..00000000000 --- a/queue-3.14/drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2a7d44f47f53fa1be677f44c73d78b1bcf9c05d9 Mon Sep 17 00:00:00 2001 -From: Alex Deucher -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 - -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 - -Signed-off-by: Alex Deucher -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/radeon/radeon_pm.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - ---- a/drivers/gpu/drm/radeon/radeon_pm.c -+++ b/drivers/gpu/drm/radeon/radeon_pm.c -@@ -613,10 +613,14 @@ static umode_t hwmon_attributes_visible( - struct device *dev = container_of(kobj, struct device, kobj); - struct radeon_device *rdev = dev_get_drvdata(dev); - -- /* 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; - - return attr->mode; diff --git a/queue-3.14/series b/queue-3.14/series index b37a3e3f12e..61d5ae95cf2 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -8,10 +8,9 @@ powerpc-rtas-validate-rtas.entry-before-calling-enter_rtas.patch asoc-wm8904-correct-number-of-eq-registers.patch x86-setup-extend-low-identity-map-to-cover-whole-kernel-range.patch mm-make-sendfile-2-killable.patch -drm-nouveau-gem-return-only-valid-domain-when-there-s-only-one.patch -drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch -drm-i915-restore-lost-dpll-register-write-on-gen2-4.patch -drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch sfc-fix-memcpy-with-const-destination-compiler-warning.patch power-bq24190_charger-suppress-build-warning.patch spi-fix-pointer-integer-size-mismatch-warning.patch +drm-nouveau-gem-return-only-valid-domain-when-there-s-only-one.patch +drm-i915-restore-lost-dpll-register-write-on-gen2-4.patch +drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch -- 2.47.2