rpms/xorg-x11-drv-i810/devel intel-2.2.0-xaadefault.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.87, 1.88

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26507

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.2.0-xaadefault.patch 
Log Message:
* Tue Mar 18 2008 Dave Airlie <airlied at redhat.com> 2.2.1-14
- make XAA default for now so installer can be run on 965 hw


intel-2.2.0-xaadefault.patch:

--- NEW FILE intel-2.2.0-xaadefault.patch ---
diff -up xf86-video-intel-2.2.1/src/i830_driver.c.xaadefault xf86-video-intel-2.2.1/src/i830_driver.c
--- xf86-video-intel-2.2.1/src/i830_driver.c.xaadefault	2008-03-18 15:53:14.000000000 +1000
+++ xf86-video-intel-2.2.1/src/i830_driver.c	2008-03-18 15:53:55.000000000 +1000
@@ -1462,11 +1462,7 @@ I830PreInit(ScrnInfoPtr pScrn, int flags
     * for example. :)
     */
    if (!pI830->noAccel) {
-#ifdef I830_USE_EXA
-       pI830->useEXA = TRUE;
-#else
        pI830->useEXA = FALSE;
-#endif
 #if defined(I830_USE_XAA) && defined(I830_USE_EXA)
        int from = X_DEFAULT;
        if ((s = (char *)xf86GetOptValString(pI830->Options,


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- xorg-x11-drv-i810.spec	18 Mar 2008 05:36:13 -0000	1.87
+++ xorg-x11-drv-i810.spec	18 Mar 2008 05:56:30 -0000	1.88
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.2.1
-Release:   13%{?dist}
+Release:   14%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -27,6 +27,9 @@
 Patch7: intel-quirk-dvo.patch
 Patch8: intel-2.1.1-disable-ttm.patch
 
+# EXA on 965 without DRI is broken - fix for now so installer can run
+Patch9: intel-2.2.0-xaadefault.patch
+
 Patch100: intel-master.patch
 Patch101: intel-batchbuffer.patch
 Patch102: intel-modeset.patch
@@ -70,6 +73,7 @@
 %patch6 -p1 -b .pciaccessvers
 %patch7 -p1 -b .quirk
 %patch8 -p1 -b .disablettm
+%patch9 -p1 -b .xaadefault
 %patch100 -p1 -b .intel-master
 
 cd ../xf86-video-intel-%{batchbuffer_version}
@@ -141,6 +145,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Tue Mar 18 2008 Dave Airlie <airlied at redhat.com> 2.2.1-14
+- make XAA default for now so installer can be run on 965 hw
+
 * Tue Mar 18 2008 Dave Airlie <airlied at redhat.com> 2.2.1-13
 - fix modesetting for normal DRI codepath