Intel driver

[Lukas Hejtmanek]

Hello,

just tried your latest driver in users/jbarnes/xf86-video-intel.

It segfaults at startup.

The following patch fixes the segfault (the second junk).
The first junk is needed as xf86InitialConfiguration zeroes PIPEBCONF
register for some strange reason. Which means that the driver disables PIPEB
in LeaveVT.

I have X server xorg-server 2:1.4.1~git20071212-1ubuntu2 on X86_64
architecture.

diff --git a/src/i830_driver.c b/src/i830_driver.c
index 2bf5631..0231244 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -1543,6 +1543,8 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
       return FALSE;
    }
 
+   RestoreHWState(pScrn);
+
    /* XXX This should go away, replaced by xf86Crtc.c support for it */
    pI830->rotation = RR_Rotate_0;
 
@@ -1835,7 +1837,7 @@ i830_refresh_ring(ScrnInfoPtr pScrn)
    /* If we're reaching RefreshRing as a result of grabbing the DRI lock
     * before we've set up the ringbuffer, don't bother.
     */
-   if (pI830->LpRing->mem == NULL)
+   if (pI830->LpRing == NULL || pI830->LpRing->mem == NULL)
        return;
 
    pI830->LpRing->head = INREG(LP_RING + RING_HEAD) & I830_HEAD_MASK;

-- 
Lukáš Hejtmánek