summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon
diff options
context:
space:
mode:
authorAlex Deucher2009-09-11 17:15:43 +0200
committerDave Airlie2009-09-12 00:05:02 +0200
commit7747b713049e63aa64bcac679535ddfff92b312d (patch)
tree609f798e3112ccfcf818ea69b9918def2373b7bf /drivers/gpu/drm/radeon
parentdrm/radeon/kms: set fbdev_info for suspend/resume (diff)
downloadkernel-qcow2-linux-7747b713049e63aa64bcac679535ddfff92b312d.tar.gz
kernel-qcow2-linux-7747b713049e63aa64bcac679535ddfff92b312d.tar.xz
kernel-qcow2-linux-7747b713049e63aa64bcac679535ddfff92b312d.zip
drm/radeon/kms: add common lvds modes in the ddc case
previous patch only handled the non-ddc case. Signed-off-by: Alex Deucher <alexdeucher@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu/drm/radeon')
-rw-r--r--drivers/gpu/drm/radeon/radeon_connectors.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index c44871c80aba..04ecb11ebb8c 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -236,6 +236,10 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)
if (radeon_connector->ddc_bus) {
ret = radeon_ddc_get_modes(radeon_connector);
if (ret > 0) {
+ encoder = radeon_best_single_encoder(connector);
+ if (encoder)
+ /* add scaled modes */
+ radeon_add_common_modes(encoder, connector);
return ret;
}
}
@@ -249,11 +253,10 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)
if (mode) {
ret = 1;
drm_mode_probed_add(connector, mode);
+ /* add scaled modes */
+ radeon_add_common_modes(encoder, connector);
}
- /* add scaled modes */
- radeon_add_common_modes(encoder, connector);
-
return ret;
}