diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-09-11 11:15:43 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2009-09-11 18:05:02 -0400 |
commit | 7747b713049e63aa64bcac679535ddfff92b312d (patch) | |
tree | 609f798e3112ccfcf818ea69b9918def2373b7bf /drivers/gpu | |
parent | 2f9a60d76692ffbc749d97ac55717f70eb1f9432 (diff) |
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')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_connectors.c | 9 |
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) | |||
236 | if (radeon_connector->ddc_bus) { | 236 | if (radeon_connector->ddc_bus) { |
237 | ret = radeon_ddc_get_modes(radeon_connector); | 237 | ret = radeon_ddc_get_modes(radeon_connector); |
238 | if (ret > 0) { | 238 | if (ret > 0) { |
239 | encoder = radeon_best_single_encoder(connector); | ||
240 | if (encoder) | ||
241 | /* add scaled modes */ | ||
242 | radeon_add_common_modes(encoder, connector); | ||
239 | return ret; | 243 | return ret; |
240 | } | 244 | } |
241 | } | 245 | } |
@@ -249,11 +253,10 @@ static int radeon_lvds_get_modes(struct drm_connector *connector) | |||
249 | if (mode) { | 253 | if (mode) { |
250 | ret = 1; | 254 | ret = 1; |
251 | drm_mode_probed_add(connector, mode); | 255 | drm_mode_probed_add(connector, mode); |
256 | /* add scaled modes */ | ||
257 | radeon_add_common_modes(encoder, connector); | ||
252 | } | 258 | } |
253 | 259 | ||
254 | /* add scaled modes */ | ||
255 | radeon_add_common_modes(encoder, connector); | ||
256 | |||
257 | return ret; | 260 | return ret; |
258 | } | 261 | } |
259 | 262 | ||