aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-07-08 16:17:23 -0400
committerDave Airlie <airlied@redhat.com>2009-07-15 03:13:13 -0400
commit2007d633d639c896396e4c4b53b38068f3831307 (patch)
treec38d720b748bca59c3e3e78f9641d7e84eddc42e /drivers/gpu
parent848577ee27f704231b1860ae987a1be78b88b06e (diff)
drm/radeon/kms: get lvds info for DIG LVTMA and UNIPHY encoders
Noticed by Rafał Miłecki on dri-devel. On r6xx/r7xx hardware, laptop panels can be driven by KLDSCP_LVTMA or UNIPHY. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/radeon_encoders.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c
index c8ef0d14ffab..ea15284e7580 100644
--- a/drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/drivers/gpu/drm/radeon/radeon_encoders.c
@@ -1700,8 +1700,14 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
1700 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: 1700 case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA:
1701 case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: 1701 case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
1702 case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: 1702 case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
1703 drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS); 1703 if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) {
1704 radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); 1704 radeon_encoder->rmx_type = RMX_FULL;
1705 drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS);
1706 radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder);
1707 } else {
1708 drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
1709 radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
1710 }
1705 drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); 1711 drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
1706 break; 1712 break;
1707 } 1713 }