3.0-stable patches

added patches:
	drm-radeon-don-t-use-get_engine_clock-on-apus.patch

diff --git a/queue-3.0/drm-radeon-don-t-use-get_engine_clock-on-apus.patch b/queue-3.0/drm-radeon-don-t-use-get_engine_clock-on-apus.patch
new file mode 100644 (file)
index 0000000..5f832f1
--- /dev/null
+++ b/queue-3.0/drm-radeon-don-t-use-get_engine_clock-on-apus.patch
@@ -0,0 +1,37 @@
+From bf05d9985111f85ed6922c134567b96eb789283b Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Mon, 18 Mar 2013 17:12:50 -0400
+Subject: drm/radeon: don't use get_engine_clock() on APUs
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+commit bf05d9985111f85ed6922c134567b96eb789283b upstream.
+
+It doesn't work reliably.  Just report back the currently
+selected engine clock.
+
+Partially fixes:
+https://bugs.freedesktop.org/show_bug.cgi?id=62493
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/radeon/radeon_pm.c |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/radeon/radeon_pm.c
++++ b/drivers/gpu/drm/radeon/radeon_pm.c
+@@ -845,7 +845,11 @@ static int radeon_debugfs_pm_info(struct
+       struct radeon_device *rdev = dev->dev_private;
+ 
+       seq_printf(m, "default engine clock: %u0 kHz\n", rdev->pm.default_sclk);
+-      seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
++      /* radeon_get_engine_clock is not reliable on APUs so just print the current clock */
++      if ((rdev->family >= CHIP_PALM) && (rdev->flags & RADEON_IS_IGP))
++              seq_printf(m, "current engine clock: %u0 kHz\n", rdev->pm.current_sclk);
++      else
++              seq_printf(m, "current engine clock: %u0 kHz\n", radeon_get_engine_clock(rdev));
+       seq_printf(m, "default memory clock: %u0 kHz\n", rdev->pm.default_mclk);
+       if (rdev->asic->get_memory_clock)
+               seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));

diff --git a/queue-3.0/series b/queue-3.0/series
index 2b7274eb4482ddaf3d6aa27d440d221006dd93f5..4bda36ef4449f60bfd3ad00fd489741f373f9154 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -3,3 +3,4 @@ autofs-remove-autofs-dentry-mount-check.patch
 ipvs-ip_vs_sip_fill_param-bug-bad-check-of-return-value.patch
 drm-i915-add-no-lvds-quirk-for-fujitsu-esprimo-q900.patch
 drm-i915-fall-back-to-bit-banging-mode-for-dvo-transmitter-detection.patch
+drm-radeon-don-t-use-get_engine_clock-on-apus.patch