Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / gpu / drm / radeon / radeon_connectors.c

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 8afaf7a7459e1c27ece79fee57d384d1bcaf67d9..22b7e3dc0eca449604aefd96e1777e0e2c9e1030 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -472,6 +472,9 @@ static int radeon_lvds_get_modes(struct drm_connector *connector)
        if (mode) {
                ret = 1;
                drm_mode_probed_add(connector, mode);
+               /* add the width/height from vbios tables if available */
+               connector->display_info.width_mm = mode->width_mm;
+               connector->display_info.height_mm = mode->height_mm;
                /* add scaled modes */
                radeon_add_common_modes(encoder, connector);
        }
@@ -1216,7 +1219,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                if (ASIC_IS_AVIVO(rdev)) {
                        drm_connector_attach_property(&radeon_connector->base,
                                                      rdev->mode_info.underscan_property,
-                                                     UNDERSCAN_AUTO);
+                                                     UNDERSCAN_OFF);
                        drm_connector_attach_property(&radeon_connector->base,
                                                      rdev->mode_info.underscan_hborder_property,
                                                      0);
@@ -1256,7 +1259,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                if (ASIC_IS_AVIVO(rdev)) {
                        drm_connector_attach_property(&radeon_connector->base,
                                                      rdev->mode_info.underscan_property,
-                                                     UNDERSCAN_AUTO);
+                                                     UNDERSCAN_OFF);
                        drm_connector_attach_property(&radeon_connector->base,
                                                      rdev->mode_info.underscan_hborder_property,
                                                      0);
@@ -1299,7 +1302,7 @@ radeon_add_atom_connector(struct drm_device *dev,
                if (ASIC_IS_AVIVO(rdev)) {
                        drm_connector_attach_property(&radeon_connector->base,
                                                      rdev->mode_info.underscan_property,
-                                                     UNDERSCAN_AUTO);
+                                                     UNDERSCAN_OFF);
                        drm_connector_attach_property(&radeon_connector->base,
                                                      rdev->mode_info.underscan_hborder_property,
                                                      0);