From 0b4ae880ec81fd082f3168e9b0f9d693c8d6042f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 9 May 2013 12:45:14 -0700 Subject: [PATCH] 3.0-stable patches added patches: drm-radeon-don-t-use-get_engine_clock-on-apus.patch --- ...n-don-t-use-get_engine_clock-on-apus.patch | 37 +++++++++++++++++++ queue-3.0/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-3.0/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 index 00000000000..5f832f1db69 --- /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 +Date: Mon, 18 Mar 2013 17:12:50 -0400 +Subject: drm/radeon: don't use get_engine_clock() on APUs + +From: Alex Deucher + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + 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 2b7274eb448..4bda36ef444 100644 --- 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 -- 2.47.3