This is a note to let you know that I've just added the patch titled
drm/radeon: fix dig encoder selection on DCE61
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:
drm-radeon-fix-dig-encoder-selection-on-dce61.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 41fa54377057ab38bc3e08ebb46168a7daf2e63b Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Wed, 29 Aug 2012 19:48:26 -0400
Subject: drm/radeon: fix dig encoder selection on DCE61
From: Alex Deucher <[email protected]>
commit 41fa54377057ab38bc3e08ebb46168a7daf2e63b upstream.
Was using the DCE41 code which was wrong. Fixes
blank displays on a number of Trinity systems.
Signed-off-by: Alex Deucher <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/gpu/drm/radeon/atombios_encoders.c | 31 ++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
--- a/drivers/gpu/drm/radeon/atombios_encoders.c
+++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -1769,13 +1769,34 @@ static int radeon_atom_pick_dig_encoder(
struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc);
struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
struct drm_encoder *test_encoder;
- struct radeon_encoder_atom_dig *dig;
+ struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
uint32_t dig_enc_in_use = 0;
- /* DCE4/5 */
- if (ASIC_IS_DCE4(rdev)) {
- dig = radeon_encoder->enc_priv;
- if (ASIC_IS_DCE41(rdev)) {
+ if (ASIC_IS_DCE6(rdev)) {
+ /* DCE6 */
+ switch (radeon_encoder->encoder_id) {
+ case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
+ if (dig->linkb)
+ return 1;
+ else
+ return 0;
+ break;
+ case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
+ if (dig->linkb)
+ return 3;
+ else
+ return 2;
+ break;
+ case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
+ if (dig->linkb)
+ return 5;
+ else
+ return 4;
+ break;
+ }
+ } else if (ASIC_IS_DCE4(rdev)) {
+ /* DCE4/5 */
+ if (ASIC_IS_DCE41(rdev) && !ASIC_IS_DCE61(rdev)) {
/* ontario follows DCE4 */
if (rdev->family == CHIP_PALM) {
if (dig->linkb)
Patches currently in stable-queue which might be from [email protected]
are
queue-3.4/drm-radeon-implement-acpi-vfct-vbios-fetch-v3.patch
queue-3.4/drm-radeon-atom-rework-dig-modesetting-on-dce3.patch
queue-3.4/drm-radeon-split-atrm-support-out-from-the-atpx-handler-v3.patch
queue-3.4/drm-radeon-convert-radeon-vfct-code-to-use-acpi_get_table_with_size.patch
queue-3.4/drm-radeon-force-dma32-to-fix-regression-rs4xx-rs6xx-rs740.patch
queue-3.4/drm-radeon-don-t-disable-plls-that-are-in-use-by-other-crtcs.patch
queue-3.4/drm-radeon-avoid-turning-off-spread-spectrum-for-used-pll.patch
queue-3.4/drm-radeon-ss-use-num_crtc-rather-than-hardcoded-6.patch
queue-3.4/drm-radeon-fix-dig-encoder-selection-on-dce61.patch
queue-3.4/drm-radeon-kms-extend-the-fujitsu-d3003-s2-board-connector-quirk-to-cover-later-silicon-stepping.patch
queue-3.4/drm-radeon-atom-powergating-fixes-for-dce6.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
