diff --git a/src/i830_lvds.c b/src/i830_lvds.c index 639450a..4f06957 100644 --- a/src/i830_lvds.c +++ b/src/i830_lvds.c @@ -1335,35 +1335,24 @@ i830_lvds_init(ScrnInfoPtr pScrn) goto found_mode; } - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Attempting to determine panel fixed mode.\n"); - /* Attempt to get the fixed panel mode from DDC. Assume that the preferred - * mode is the right one. - */ - modes = i830_ddc_get_modes(output); - for (scan = modes; scan != NULL; scan = scan->next) { - if (scan->type & M_T_PREFERRED) - break; - } - if (scan != NULL) { - /* Pull our chosen mode out and make it the fixed mode */ - if (modes == scan) - modes = modes->next; - if (scan->prev != NULL) - scan->prev = scan->next; - if (scan->next != NULL) - scan->next = scan->prev; - lvds_ddc_mode = scan; - } - /* Delete the mode list */ - while (modes != NULL) - xf86DeleteMode(&modes, modes); + pI830->lvds_fixed_mode = xcalloc (1, sizeof (DisplayModeRec)); + memset(pI830->lvds_fixed_mode, 0, sizeof (DisplayModeRec)); + pI830->lvds_fixed_mode->HDisplay = 800; + pI830->lvds_fixed_mode->HSyncStart = 860; + pI830->lvds_fixed_mode->HSyncEnd = 940; + pI830->lvds_fixed_mode->HTotal = 1000; + pI830->lvds_fixed_mode->VDisplay = 480; + pI830->lvds_fixed_mode->VSyncStart = 508; + pI830->lvds_fixed_mode->VSyncEnd = 511; + pI830->lvds_fixed_mode->VTotal = 525; + pI830->lvds_fixed_mode->Clock = 31746; + pI830->lvds_fixed_mode->Flags = V_PHSYNC |V_PVSYNC; + pI830->lvds_fixed_mode->type = M_T_PREFERRED; + xf86SetModeDefaultName(pI830->lvds_fixed_mode); + + goto found_mode; - if (lvds_ddc_mode) { - pI830->lvds_fixed_mode = lvds_ddc_mode; - goto found_mode; - } /* 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