rpms/xorg-x11-drv-i810/F-9 intel-2.3.2-cantiga.fix.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.101, 1.102

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17687

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.3.2-cantiga.fix.patch 
Log Message:
* Wed Nov 12 2008 Dave Airlie <airlied at redhat.com> 2.3.2-3
- fix ctg until we rebase this.


intel-2.3.2-cantiga.fix.patch:

--- NEW FILE intel-2.3.2-cantiga.fix.patch ---
diff -up xf86-video-intel-2.3.2/src/i830_driver.c.da xf86-video-intel-2.3.2/src/i830_driver.c
--- xf86-video-intel-2.3.2/src/i830_driver.c.da	2008-11-12 13:51:31.000000000 +1000
+++ xf86-video-intel-2.3.2/src/i830_driver.c	2008-11-12 13:52:45.000000000 +1000
@@ -511,6 +511,9 @@ I830DetectMemory(ScrnInfoPtr pScrn)
     */
    range = gtt_size + 4;
 
+   if (IS_IGD_GM(pI830))
+	range = 4;
+
    if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) {
       switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
       case I855_GMCH_GMS_STOLEN_1M:


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/F-9/xorg-x11-drv-i810.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- xorg-x11-drv-i810.spec	2 Jul 2008 15:09:49 -0000	1.101
+++ xorg-x11-drv-i810.spec	12 Nov 2008 03:54:23 -0000	1.102
@@ -3,10 +3,12 @@
 
 %define batchbuffer_version 2.2.0-219-gc9676d0
 
+%define _default_patch_fuzz 2
+
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.3.2
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -31,6 +33,7 @@
 # Framebuffer compression causes artifacts, display blanking
 # https://bugs.freedesktop.org/show_bug.cgi?id=13326
 Patch11: intel-2.2.1-disable-fbc.patch
+Patch15: intel-2.3.2-cantiga.fix.patch
 
 Patch100: intel-master.patch
 Patch101: intel-batchbuffer.patch
@@ -72,6 +75,7 @@
 #patch4 -p1 -b .xv-compiz
 %patch8 -p1 -b .disablettm
 %patch11 -p1 -b .fbc
+%patch15 -p1 -b .ctg
 %patch100 -p1 -b .intel-master
 
 cd ../xf86-video-intel-%{batchbuffer_version}
@@ -149,6 +153,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Wed Nov 12 2008 Dave Airlie <airlied at redhat.com> 2.3.2-3
+- fix ctg until we rebase this.
+
 * Wed Jul 02 2008 Adam Jackson <ajax at redhat.com> 2.3.2-2
 - Drop the %%pre hack for the moment.