drm/radeon/kms: use hardcoded dig encoder to transmitter mapping for DCE4.1
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 5 Oct 2011 22:36:50 +0000 (18:36 -0400)
committerDave Airlie <airlied@redhat.com>
Thu, 6 Oct 2011 10:45:30 +0000 (11:45 +0100)
The encoders are supposedly fully routeable, but changing the mapping
doesn't always seem to take.  Using a hardcoded mapping is much more
reliable.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=41366

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Tested-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_encoders.c

index 13690f3eb4a4dba8474b6a678b5c0a7f58af8898..8a171b21b453d76dd01665a58ce0b1c650c1f814 100644 (file)
@@ -1755,9 +1755,12 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder)
        /* DCE4/5 */
        if (ASIC_IS_DCE4(rdev)) {
                dig = radeon_encoder->enc_priv;
-               if (ASIC_IS_DCE41(rdev))
-                       return radeon_crtc->crtc_id;
-               else {
+               if (ASIC_IS_DCE41(rdev)) {
+                       if (dig->linkb)
+                               return 1;
+                       else
+                               return 0;
+               } else {
                        switch (radeon_encoder->encoder_id) {
                        case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
                                if (dig->linkb)