This is a note to let you know that I've just added the patch titled
drm/radeon: fix runpm disabling on non-PX harder
to the 3.13-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-fix-runpm-disabling-on-non-px-harder.patch
and it can be found in the queue-3.13 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7848865914c6a63ead674f0f5604b77df7d3874f Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Tue, 11 Mar 2014 15:02:30 -0400
Subject: drm/radeon: fix runpm disabling on non-PX harder
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 7848865914c6a63ead674f0f5604b77df7d3874f upstream.
Make sure runtime pm is disabled on non-PX hardware.
Should fix powerdown problems without displays attached.
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/radeon_kms.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -33,6 +33,13 @@
#include <linux/vga_switcheroo.h>
#include <linux/slab.h>
#include <linux/pm_runtime.h>
+
+#if defined(CONFIG_VGA_SWITCHEROO)
+bool radeon_is_px(void);
+#else
+static inline bool radeon_is_px(void) { return false; }
+#endif
+
/**
* radeon_driver_unload_kms - Main unload function for KMS.
*
@@ -130,7 +137,8 @@ int radeon_driver_load_kms(struct drm_de
"Error during ACPI methods call\n");
}
- if (radeon_runtime_pm != 0) {
+ if ((radeon_runtime_pm == 1) ||
+ ((radeon_runtime_pm == -1) && radeon_is_px())) {
pm_runtime_use_autosuspend(dev->dev);
pm_runtime_set_autosuspend_delay(dev->dev, 5000);
pm_runtime_set_active(dev->dev);
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-3.13/drm-radeon-fix-runpm-disabling-on-non-px-harder.patch
queue-3.13/drm-radeon-dpm-fix-typo-in-evergreen_smc_firmware_header_softregisters.patch
queue-3.13/drm-radeon-cik-properly-set-sdma-ring-status-on-disable.patch
queue-3.13/drm-radeon-cik-stop-the-sdma-engines-in-the-enable-function.patch
queue-3.13/drm-radeon-re-order-firmware-loading-in-preparation-for-dpm-rework.patch
queue-3.13/drm-radeon-atom-select-the-proper-number-of-lanes-in.patch
queue-3.13/drm-radeon-ttm-must-be-init-with-cpu-visible-vram-v2.patch
queue-3.13/drm-radeon-cik-properly-set-compute-ring-status-on-disable.patch
queue-3.13/drm-radeon-fix-minor-typos-in-si_dpm.c.patch
queue-3.13/drm-radeon-si-fix-typo-in-dpm-sq-ramping-setup.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html