From b83cd4bcb4274dd56b5ea1d199151e093350a8ef Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Sun, 25 Nov 2007 18:44:18 +0000 Subject: - disable dri support explicitely for now. - fix some merge botches. Long live CVS. --- driver/xf86-video-intel/src/i830_accel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'driver/xf86-video-intel/src/i830_accel.c') 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; { -- cgit v1.2.3