Commit cb7cf419 authored Oct 05, 2011 by Alex Deucher Committed by Dave Airlie Oct 06, 2011

drm/radeon/kms: use hardcoded dig encoder to transmitter mapping for DCE4.1

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>

parent 6777a4f6

drivers/gpu/drm/radeon/radeon_encoders.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -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)