qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- disable dri support explicitely for now.

Browse Source 
- fix some merge botches. Long live CVS.
This commit is contained in:
matthieu 2007-11-25 18:44:17 +00:00
parent a7908c655f
commit 7b2d1daf02
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
driver/xf86-video-intel/Makefile.bsd-wrapper
View File

@ -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>

4
driver/xf86-video-intel/src/i830_accel.c
View File

@ -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;
{

2
driver/xf86-video-intel/src/i830_driver.c
View File

@ -2265,7 +2265,7 @@ IntelEmitInvarientState(ScrnInfoPtr pScrn)
ADVANCE_LP_RING();
}
if (!IS_I96X(pI830))
if (!IS_I965G(pI830))
{
if (IS_I9XX(pI830))
I915EmitInvarientState(pScrn);