diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2009-09-08 22:22:45 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-09-08 23:35:37 +0400 |
| commit | 60d15f551abdbc5fef70d85f55aac1e85950bf59 (patch) | |
| tree | 6d60c7b83cdb714344609452c761f6046d3cecf7 /drivers/gpu/drm/radeon/radeon_encoders.c | |
| parent | cc84ef3fd20ef6dfe5fbc4778e7017d015b3bf7d (diff) | |
| download | linux-60d15f551abdbc5fef70d85f55aac1e85950bf59.tar.xz | |
drm/radeon/kms: re-apply 2007d633d639c896396e4c4b53b38068f3831307
Got accidently reverted by c93bb85b5cba3e3a06f2cad8e9bc5c23d3d10aac
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_encoders.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_encoders.c | 10 |
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 8a353eab4f32..9ad20350118f 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c @@ -1400,8 +1400,14 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: - drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS); - radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); + if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { + radeon_encoder->rmx_type = RMX_FULL; + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_LVDS); + radeon_encoder->enc_priv = radeon_atombios_get_lvds_info(radeon_encoder); + } else { + drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS); + radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder); + } drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); break; } |