rpms/kernel/F-11 agp-set_memory_ucwb.patch, 1.3, 1.4 kernel.spec, 1.1741, 1.1742

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20795

Modified Files:
	agp-set_memory_ucwb.patch kernel.spec 
Log Message:
Disable the GEM graphics manager on i686 PAE kernels
  (fixes modesetting on Intel graphics.)

agp-set_memory_ucwb.patch:
 generic.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Index: agp-set_memory_ucwb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/agp-set_memory_ucwb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- agp-set_memory_ucwb.patch	25 Jul 2009 04:09:15 -0000	1.3
+++ agp-set_memory_ucwb.patch	25 Sep 2009 05:46:42 -0000	1.4
@@ -52,15 +52,3 @@ index 97e8b41..aeeaf68 100644
  		page = virt_to_page(addr);
  
  #ifndef CONFIG_X86
-diff -up linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c.dma linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c
---- linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c.dma	2009-02-27 13:11:03.000000000 +1000
-+++ linux-2.6.28.noarch/drivers/gpu/drm/i915/i915_dma.c	2009-02-27 13:11:11.000000000 +1000
-@@ -1104,7 +1104,7 @@ int i915_driver_load(struct drm_device *
- 			 "performance may suffer.\n");
- 	}
- 
--#ifdef CONFIG_HIGHMEM64G
-+#if 0 /* Fedora has AGP workaround patch */
- 	/* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
- 	dev_priv->has_gem = 0;
- #else


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1741
retrieving revision 1.1742
diff -u -p -r1.1741 -r1.1742
--- kernel.spec	25 Sep 2009 04:12:11 -0000	1.1741
+++ kernel.spec	25 Sep 2009 05:46:42 -0000	1.1742
@@ -681,7 +681,6 @@ Patch1824: drm-radeon-cs-oops-fix.patch
 Patch1825: drm-pnp-add-resource-range-checker.patch
 Patch1826: drm-i915-enable-mchbar.patch
 
-
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
 
@@ -1338,7 +1337,7 @@ ApplyPatch drm-i915-resume-force-mode.pa
 ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-gen3-fb-hack.patch
 ApplyPatch drm-intel-hdmi-edid-fix.patch
-#ApplyPatch drm-intel-gem-use-dma32-on-pae.patch
+ApplyPatch drm-intel-gem-use-dma32-on-pae.patch
 ApplyPatch drm-modesetting-radeon-fixes.patch
 ApplyPatch drm-radeon-new-pciids.patch
 ApplyPatch drm-dont-frob-i2c.patch
@@ -1981,6 +1980,10 @@ fi
 # and build.
 
 %changelog
+* Fri Sep 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-63
+- Disable the GEM graphics manager on i686 PAE kernels
+  (fixes modesetting on Intel graphics.)
+
 * Fri Sep 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.30.8-62
 - Fix breakage in hostap driver (#522269)