diff options
author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-10-08 15:36:10 +0800 |
---|---|---|
committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-10-08 15:36:10 +0800 |
commit | 74571363539426abeb0a1af11f3bb545d91ed6c2 (patch) | |
tree | 0d65293acc5311a4762f5b8512526dde310093c6 | |
parent | 111dd151dedf535464d638461f9485ec2939780e (diff) |
Put forware VBIOS data parsing
i830_bios_init() is called too late after output init, which
makes bios data mostly useless, and caused all TV init fail as
tv_present flag is not set.
-rw-r--r-- | src/i830_driver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 933c8b87..c1d61f4f 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -1895,6 +1895,10 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) if (!i830_detect_chipset(pScrn)) return FALSE; + if (i830_bios_init(pScrn)) + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "VBIOS initialization failed.\n"); + I830PreInitCrtcConfig(pScrn); if (pI830->use_drm_mode) { @@ -1914,10 +1918,6 @@ I830PreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - if (i830_bios_init(pScrn)) - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "VBIOS initialization failed.\n"); - /* * XXX If we knew the pre-initialised GTT format for certain, we could * probably figure out the physical address even in the StolenOnly case. |