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

[Simon Farnsworth]

On Wednesday 5 October 2011, alexdeucher at gmail.com wrote:
> From: Alex Deucher <alexander.deucher at amd.com>
> 
> 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 at amd.com>
> Cc: stable at kernel.org

Tested-by: Simon Farnsworth <simon.farnsworth at onelan.co.uk>

I applied it to airlied's drm-fixes kernel, at commit
6777a4f6898a53974ef7fe7ce09ec41fae0f32db - it fixed my problems with HDMI
being unreliable.

> ---
>  drivers/gpu/drm/radeon/radeon_encoders.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
> index 13690f3..8a171b2 100644
> --- a/drivers/gpu/drm/radeon/radeon_encoders.c
> +++ b/drivers/gpu/drm/radeon/radeon_encoders.c
> @@ -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)
> 
-- 
Simon Farnsworth
Software Engineer
ONELAN Limited
http://www.onelan.com/