rpms/kernel/F-10 drm-no-gem-on-i8xx.patch, NONE, 1.1 patch-2.6.29-rc4-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.978, 1.979 kernel.spec, 1.1251, 1.1252 sources, 1.940, 1.941 upstream, 1.851, 1.852

[Kyle McMartin]

Author: kyle

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	drm-no-gem-on-i8xx.patch patch-2.6.29-rc4-git1.bz2.sign 
Log Message:
* Sun Feb 08 2009 Kyle McMartin <kyle at redhat.com>  2.6.29.0.22.rc4.git1
- 2.6.29-rc4-git1
- drm-no-gem-on-i8xx.patch: disable GEM on i8xx again


drm-no-gem-on-i8xx.patch:

--- NEW FILE drm-no-gem-on-i8xx.patch ---
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index cc0adb4..9303063 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1108,8 +1108,8 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	/* don't enable GEM on PAE - needs agp + set_memory_* interface fixes */
 	dev_priv->has_gem = 0;
 #else
-	/* enable GEM by default */
-	dev_priv->has_gem = 1;
+	/* enable GEM by default, except on I8xx */
+	dev_priv->has_gem = !IS_I8XX(dev) ? 1 : 0;
 #endif
 
 	i915_gem_load(dev);
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index a70bf77..84664fe 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -750,6 +750,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 #define IS_I855(dev) ((dev)->pci_device == 0x3582)
 #define IS_I865G(dev) ((dev)->pci_device == 0x2572)
 
+#define IS_I8XX(dev)	(IS_I830(dev) || IS_845G(dev) || IS_I85X(dev) ||	\
+				IS_I855(dev) || IS_I865G(dev))
+
 #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)
 #define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
 #define IS_I945G(dev) ((dev)->pci_device == 0x2772)


--- NEW FILE patch-2.6.29-rc4-git1.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJj3J7yGugalF9Dw4RAiM/AKCNOWKEYkDM5aZCzLlVXwP0wqvPTgCfQ14g
3p4+8cackPp5/L8EyaJpX5I=
=aBMm
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.978
retrieving revision 1.979
diff -u -r1.978 -r1.979
--- .cvsignore	8 Feb 2009 22:55:25 -0000	1.978
+++ .cvsignore	9 Feb 2009 04:49:20 -0000	1.979
@@ -5,3 +5,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc4.bz2
+patch-2.6.29-rc4-git1.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1251
retrieving revision 1.1252
diff -u -r1.1251 -r1.1252
--- kernel.spec	8 Feb 2009 22:55:25 -0000	1.1251
+++ kernel.spec	9 Feb 2009 04:49:20 -0000	1.1252
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 0
+%define gitrev 1
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -638,6 +638,7 @@
 # nouveau + drm fixes
 Patch1812: drm-modesetting-radeon.patch
 Patch1814: drm-nouveau.patch
+Patch1816: drm-no-gem-on-i8xx.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1155,6 +1156,7 @@
 # Nouveau DRM + drm fixes
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.patch
+ApplyPatch drm-no-gem-on-i8xx.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1745,6 +1747,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Feb 08 2009 Kyle McMartin <kyle at redhat.com>  2.6.29.0.22.rc4.git1
+- 2.6.29-rc4-git1
+- drm-no-gem-on-i8xx.patch: disable GEM on i8xx again
+
 * Sun Feb 08 2009 Kyle McMartin <kyle at redhat.com>  2.6.29.0.21.rc4
 - 2.6.29-rc4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.940
retrieving revision 1.941
diff -u -r1.940 -r1.941
--- sources	8 Feb 2009 22:55:25 -0000	1.940
+++ sources	9 Feb 2009 04:49:21 -0000	1.941
@@ -1,2 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 c5daf3d0f43873d5c2b36ddaf8d77bab  patch-2.6.29-rc4.bz2
+7fcdf5fa892e19bb1b617304d78c47f0  patch-2.6.29-rc4-git1.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -r1.851 -r1.852
--- upstream	8 Feb 2009 22:55:25 -0000	1.851
+++ upstream	9 Feb 2009 04:49:21 -0000	1.852
@@ -1,2 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc4.bz2
+patch-2.6.29-rc4-git1.bz2