diff options
| author | Eric Anholt <eric@anholt.net> | 2007-06-04 15:58:31 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-06-05 11:22:58 -0700 |
| commit | 36fcaeb2ef94db5399071540bba106dec3db81d5 (patch) | |
| tree | e6c79b5fba912fa1a7a65a4cddbef6024ad05c07 | |
| parent | 8a19e7d57bc23dd163b45e0ab7deca4f074c934d (diff) | |
Fix misplaced merge of 1280x768 panel fixup.
| -rw-r--r-- | src/i830_lvds.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/i830_lvds.c b/src/i830_lvds.c index ecc91aab..ee278aa4 100644 --- a/src/i830_lvds.c +++ b/src/i830_lvds.c @@ -496,7 +496,16 @@ i830_lvds_init(ScrnInfoPtr pScrn) dev_priv->panel_fixed_mode = i830_crtc_mode_get(pScrn, crtc); if (dev_priv->panel_fixed_mode != NULL) dev_priv->panel_fixed_mode->type |= M_T_PREFERRED; + } + } + /* Get the LVDS fixed mode out of the BIOS. We should support LVDS with + * the BIOS being unavailable or broken, but lack the configuration options + * for now. + */ + bios_mode = i830_bios_get_panel_mode(pScrn, &dev_priv->panel_wants_dither); + if (bios_mode != NULL) { + if (dev_priv->panel_fixed_mode != NULL) { /* Fixup for a 1280x768 panel with the horizontal trimmed * down to 1024 for text mode. */ @@ -512,16 +521,7 @@ i830_lvds_init(ScrnInfoPtr pScrn) dev_priv->panel_fixed_mode->HSyncEnd = 1440; dev_priv->panel_fixed_mode->HTotal = 1688; } - } - } - /* Get the LVDS fixed mode out of the BIOS. We should support LVDS with - * the BIOS being unavailable or broken, but lack the configuration options - * for now. - */ - bios_mode = i830_bios_get_panel_mode(pScrn, &dev_priv->panel_wants_dither); - if (bios_mode != NULL) { - if (dev_priv->panel_fixed_mode != NULL) { if (pI830->debug_modes && !xf86ModesEqual(dev_priv->panel_fixed_mode, bios_mode)) { |