rpms/xorg-x11-drv-i810/devel intel-2.4.2-cantiga-fix.patch, NONE, 1.1 xorg-x11-drv-i810.spec, 1.112, 1.113

[Dave Airlie]

Author: airlied

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

Modified Files:
	xorg-x11-drv-i810.spec 
Added Files:
	intel-2.4.2-cantiga-fix.patch 
Log Message:
- intel-2.4.2-cantiga-fix.patch - hopefully fix cantiga


intel-2.4.2-cantiga-fix.patch:

--- NEW FILE intel-2.4.2-cantiga-fix.patch ---
From: Eric Anholt <eric at anholt.net>

On the GM45 we were assuming too little stolen memory (mostly harmless,
except when it wasn't, until the AGP fix), and on the G45 we were assuming too
much stolen memory, which was quite harmful when we touched the page that
didn't get mapped.

Future stolen memory accounting should use src/reg_dumper/intel_gtt before and
after enabling AGP on the chipset to confirm that only the GTT entries not
mapped to stolen are replaced, and that all of the unmapped GTT entries are
replaced with the constant scratch page.
---
 src/i830_driver.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i830_driver.c b/src/i830_driver.c
index c1d61f4..eaf5d27 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -502,8 +502,8 @@ I830DetectMemory(ScrnInfoPtr pScrn)
    range = gtt_size + 4;
 
    /* new 4 series hardware has seperate GTT stolen with GFX stolen */
-   if (IS_G4X(pI830))
-       range = 0;
+   if (IS_G4X(pI830) || IS_GM45(pI830))
+       range = 4;
 
    if (IS_I85X(pI830) || IS_I865G(pI830) || IS_I9XX(pI830)) {
       switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
-- 
1.5.6.5




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.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- xorg-x11-drv-i810.spec	14 Oct 2008 21:47:01 -0000	1.112
+++ xorg-x11-drv-i810.spec	14 Oct 2008 23:43:46 -0000	1.113
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
 Version:   2.4.2
-Release:   11%{?dist}
+Release:   12%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -21,6 +21,7 @@
 Source3:   intel-stub.c
 
 Patch1: intel-2.4.2-git-diffs.patch
+Patch2: intel-2.4.2-cantiga-fix.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
 #Patch4: intel-fix-flip.patch
 Patch5: intel-fix-irq.patch
@@ -55,6 +56,7 @@
 %prep
 %setup -q -n xf86-video-intel-%{version}
 %patch1 -p1 -b .gitupdate
+%patch2 -p1 -b .cantiga
 %patch3 -p1 -b .xvfix
 #patch4 -p1 -b .fixflip
 %patch5 -p1 -b .irqfix
@@ -101,6 +103,9 @@
 %{_libdir}/libIntelXvMC.so
 
 %changelog
+* Tue Oct 14 2008 Dave Airlie <airlied at redhat.com> 2.4.2-12
+- intel-2.4.2-cantiga-fix.patch - hopefully fix cantiga
+
 * Tue Oct 14 2008 Adam Jackson <ajax at redhat.com> 2.4.2-11
 - intel-2.4.2-macmini-fix.patch: Fix a segfault on Mac Mini.