This is a note to let you know that I've just added the patch titled
drm/radeon: don't set default clocks for SI when DPM is disabled
to the 3.11-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-don-t-set-default-clocks-for-si-when-dpm-is-disabled.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 360991867d83e10827d907ef67206986a98953b3 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@xxxxxxx>
Date: Sat, 21 Sep 2013 14:37:49 -0400
Subject: drm/radeon: don't set default clocks for SI when DPM is disabled
From: Alex Deucher <alexander.deucher@xxxxxxx>
commit 360991867d83e10827d907ef67206986a98953b3 upstream.
This is a partial revert of c6cf7777a32da874fabec4fd1c2a579f0ba4e4dd.
We need to take into account the clk voltage dependencies of the
board. Not doing so can lead to stability issues on certain
boards if the clks exceed the levels in the dep tables.
DPM already takes that into account, so for optimal performance,
use DPM.
Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/radeon/radeon_pm.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -919,7 +919,7 @@ static void radeon_pm_resume_old(struct
{
/* set up the default clocks if the MC ucode is loaded */
if ((rdev->family >= CHIP_BARTS) &&
- (rdev->family <= CHIP_HAINAN) &&
+ (rdev->family <= CHIP_CAYMAN) &&
rdev->mc_fw) {
if (rdev->pm.default_vddc)
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
@@ -963,7 +963,7 @@ static void radeon_pm_resume_dpm(struct
if (ret) {
DRM_ERROR("radeon: dpm resume failed\n");
if ((rdev->family >= CHIP_BARTS) &&
- (rdev->family <= CHIP_HAINAN) &&
+ (rdev->family <= CHIP_CAYMAN) &&
rdev->mc_fw) {
if (rdev->pm.default_vddc)
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
@@ -1014,7 +1014,7 @@ static int radeon_pm_init_old(struct rad
radeon_pm_init_profile(rdev);
/* set up the default clocks if the MC ucode is loaded */
if ((rdev->family >= CHIP_BARTS) &&
- (rdev->family <= CHIP_HAINAN) &&
+ (rdev->family <= CHIP_CAYMAN) &&
rdev->mc_fw) {
if (rdev->pm.default_vddc)
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
@@ -1099,7 +1099,7 @@ static int radeon_pm_init_dpm(struct rad
if (ret) {
rdev->pm.dpm_enabled = false;
if ((rdev->family >= CHIP_BARTS) &&
- (rdev->family <= CHIP_HAINAN) &&
+ (rdev->family <= CHIP_CAYMAN) &&
rdev->mc_fw) {
if (rdev->pm.default_vddc)
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
Patches currently in stable-queue which might be from alexander.deucher@xxxxxxx are
queue-3.11/drm-radeon-disable-tests-benchmarks-if-accel-is-disabled.patch
queue-3.11/drm-radeon-make-r100_cp_ring_info-and-radeon_ring_gfx-safe-v2.patch
queue-3.11/drm-radeon-add-missing-hdmi-callbacks-for-rv6xx.patch
queue-3.11/drm-radeon-cik-fix-overflow-in-vram-fetch.patch
queue-3.11/drm-radeon-cik-fix-printing-of-client-name-on-vm-protection-fault.patch
queue-3.11/drm-radeon-avoid-uvd-corruption-on-agp-cards-using-gpu-gart.patch
queue-3.11/drm-radeon-cik-fix-encoding-of-number-of-banks-in-tiling-configuration-info.patch
queue-3.11/drm-radeon-don-t-set-default-clocks-for-si-when-dpm-is-disabled.patch
queue-3.11/drm-radeon-fix-hdmi-audio-on-dce3.0-3.1-asics.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