xf86-video-intel: src/i830_driver.c

[Zhenyu Wang]

 src/i830_driver.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 74571363539426abeb0a1af11f3bb545d91ed6c2
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Wed Oct 8 15:36:10 2008 +0800

    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.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 933c8b8..c1d61f4 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.