- disable dri support explicitely for now.

- fix some merge botches. Long live CVS.

3 files changed, 6 insertions, 4 deletions

diff --git a/driver/xf86-video-intel/Makefile.bsd-wrapper b/driver/xf86-video-intel/Makefile.bsd-wrapper
index cd59c5869..55865b108 100644
--- a/driver/xf86-video-intel/Makefile.bsd-wrapper
+++ b/driver/xf86-video-intel/Makefile.bsd-wrapper
@@ -1,3 +1,5 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:30:44 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2007/11/25 18:44:17 matthieu Exp $
+
+CONFIGURE_ARGS += --disable-dri
 
 .include <bsd.xorg.mk>
diff --git a/driver/xf86-video-intel/src/i830_accel.c b/driver/xf86-video-intel/src/i830_accel.c
index 53f17a9e2..7501c2b7c 100644
--- a/driver/xf86-video-intel/src/i830_accel.c
+++ b/driver/xf86-video-intel/src/i830_accel.c
@@ -183,7 +183,7 @@ I830Sync(ScrnInfoPtr pScrn)
 
    if (pI830->entityPrivate && !pI830->entityPrivate->RingRunning) return;
 
-   if (IS_I96X(pI830))
+   if (IS_I965G(pI830))
       flags = 0;
 
    /* Send a flush instruction and then wait till the ring is empty.
@@ -210,7 +210,7 @@ I830EmitFlush(ScrnInfoPtr pScrn)
    I830Ptr pI830 = I830PTR(pScrn);
    int flags = MI_WRITE_DIRTY_STATE | MI_INVALIDATE_MAP_CACHE;
 
-   if (IS_I96X(pI830))
+   if (IS_I965G(pI830))
       flags = 0;
 
    {
diff --git a/driver/xf86-video-intel/src/i830_driver.c b/driver/xf86-video-intel/src/i830_driver.c
index 5d9d44096..7818ee4ec 100644
--- a/driver/xf86-video-intel/src/i830_driver.c
+++ b/driver/xf86-video-intel/src/i830_driver.c
@@ -2265,7 +2265,7 @@ IntelEmitInvarientState(ScrnInfoPtr pScrn)
       ADVANCE_LP_RING();
    }
 
-   if (!IS_I96X(pI830))
+   if (!IS_I965G(pI830))
    {
       if (IS_I9XX(pI830))
          I915EmitInvarientState(pScrn);