summaryrefslogtreecommitdiff
path: root/src/i830_driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/i830_driver.c')
-rw-r--r--src/i830_driver.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c
index f27d9575..64d0db1f 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1503,9 +1503,9 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
}
if (xf86ReturnOptValBool(pI830->Options, OPTION_LVDSFIXEDMODE, TRUE)) {
- pI830->lvds_fixed_mode = TRUE;
+ pI830->skip_panel_detect = TRUE;
} else {
- pI830->lvds_fixed_mode = FALSE;
+ pI830->skip_panel_detect = FALSE;
}
if (xf86ReturnOptValBool(pI830->Options, OPTION_FORCEENABLEPIPEA, FALSE))
@@ -1635,6 +1635,10 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
#endif
+ if (i830_bios_init(pScrn))
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+ "VBIOS initialization failed.\n");
+
I830PreInitDDC(pScrn);
for (i = 0; i < num_pipe; i++) {
i830_crtc_init(pScrn, i);