This is a note to let you know that I've just added the patch titled
drm/radeon: fix up pll selection on DCE5/6
to the 3.4-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:
0010-drm-radeon-fix-up-pll-selection-on-DCE5-6.patch
and it can be found in the queue-3.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From c06328694bb2599a382531b18bb1c3931944a136 Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 17 Jul 2012 14:02:43 -0400
Subject: drm/radeon: fix up pll selection on DCE5/6
From: Alex Deucher <[email protected]>
commit 26fe45a0a76f165425f332a5aaa298f149f9db22 upstream.
Selecting ATOM_PPLL_INVALID should be equivalent as the
DCPLL or PPLL0 are already programmed for the DISPCLK, but
the preferred method is to always specify the PLL selected.
SetPixelClock will check the parameters and skip the
programming if the PLL is already set up.
Signed-off-by: Alex Deucher <[email protected]>
Reviewed-by: Christian König <[email protected]>
Signed-off-by: Julien Cristau <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/atombios_crtc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/drivers/gpu/drm/radeon/atombios_crtc.c
+++ b/drivers/gpu/drm/radeon/atombios_crtc.c
@@ -1533,7 +1533,11 @@ static int radeon_atom_pick_pll(struct d
* crtc virtual pixel clock.
*/
if
(ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_encoder))) {
- if (ASIC_IS_DCE5(rdev) ||
rdev->clock.dp_extclk)
+ if (ASIC_IS_DCE5(rdev))
+ return ATOM_DCPLL;
+ else if (ASIC_IS_DCE6(rdev))
+ return ATOM_PPLL0;
+ else if (rdev->clock.dp_extclk)
return ATOM_PPLL_INVALID;
}
}
Patches currently in stable-queue which might be from [email protected]
are
queue-3.4/drm-radeon-fix-edp-clk-and-lane-setup-for-scaled-modes.patch
queue-3.4/0010-drm-radeon-fix-up-pll-selection-on-DCE5-6.patch
queue-3.4/radeon-kms-force-rn50-chip-to-always-report-connected-on-analog-output.patch
queue-3.4/drm-radeon-properly-handle-ddc-probe-for-dp-bridges.patch
queue-3.4/drm-radeon-add-wait_until-to-evergreen-vm-safe-reg-list.patch
queue-3.4/0013-drm-radeon-fix-ordering-in-pll-picking-on-dce4.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
