rpms/kernel/devel drm-no-gem-on-i8xx.patch, NONE, 1.1 kernel.spec, 1.1278, 1.1279

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27831

Modified Files:
	kernel.spec 
Added Files:
	drm-no-gem-on-i8xx.patch 
Log Message:
* Sun Feb 08 2009 Kyle McMartin <kyle at redhat.com>
- drm-no-gem-on-i8xx.patch: disable GEM on i8xx series graphics cards, patch
  was lost at some point during the rebasing. :/


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)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1278
retrieving revision 1.1279
diff -u -r1.1278 -r1.1279
--- kernel.spec	9 Feb 2009 04:37:17 -0000	1.1278
+++ kernel.spec	9 Feb 2009 04:45:32 -0000	1.1279
@@ -639,6 +639,7 @@
 Patch1812: drm-modesetting-radeon.patch
 Patch1814: drm-nouveau.patch
 Patch1815: drm-intel-next.patch
+Patch1816: drm-no-gem-on-i8xx.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1151,6 +1152,7 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.patch
 ApplyPatch drm-intel-next.patch
+ApplyPatch drm-no-gem-on-i8xx.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1750,6 +1752,10 @@
 
 %changelog
 * Sun Feb 08 2009 Kyle McMartin <kyle at redhat.com>
+- drm-no-gem-on-i8xx.patch: disable GEM on i8xx series graphics cards, patch
+  was lost at some point during the rebasing. :/
+
+* Sun Feb 08 2009 Kyle McMartin <kyle at redhat.com>
 - 2.6.29-rc4-git1
 
 * Sun Feb 08 2009 Kyle McMartin <kyle at redhat.com>