diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2011-10-13 00:44:32 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-10-18 11:16:10 +0200 |
| commit | 3a6dea31453a101bd5e9e9c89a79f4fcb6b0342e (patch) | |
| tree | ff126d2bc67017199049ddba761979f3bda57eb9 /drivers/gpu | |
| parent | ttm: Fix error-path using an uninitialized value (diff) | |
| download | linux-3a6dea31453a101bd5e9e9c89a79f4fcb6b0342e.tar.xz linux-3a6dea31453a101bd5e9e9c89a79f4fcb6b0342e.zip | |
drm/radeon/kms/DCE4.1: fix dig encoder to transmitter mapping
llano has fully routeable dig encoders similar to DCE3.2 while
ontario has a hardcoded mapping similar to DCE4.0.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index 8a171b21b453..a90d9eeb96a3 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -1756,10 +1756,15 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder) if (ASIC_IS_DCE4(rdev)) { dig = radeon_encoder->enc_priv; if (ASIC_IS_DCE41(rdev)) { - if (dig->linkb) - return 1; - else - return 0; + /* ontario follows DCE4 */ + if (rdev->family == CHIP_PALM) { + if (dig->linkb) + return 1; + else + return 0; + } else + /* llano follows DCE3.2 */ + return radeon_crtc->crtc_id; } else { switch (radeon_encoder->encoder_id) { case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: |