rpms/kernel/F-11 drm-intel-disable-kms-i8xx.patch, NONE, 1.1 kernel.spec, 1.1625, 1.1626

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-disable-kms-i8xx.patch 
Log Message:
* Wed May 27 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.4-164
- drm-intel-disable-kms-i8xx.patch: disable KMS by default on 845, 855,
  and 865. It can be forced on with i915.modeset=1 boot parameter.
 
* Tue May 26 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.4-163
- drm-nouveau.patch: fix sor dpms (rh#501877)


drm-intel-disable-kms-i8xx.patch:

--- NEW FILE drm-intel-disable-kms-i8xx.patch ---
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 98560e1..0d0ff31 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -27,6 +27,7 @@
  *
  */
 
+#include <linux/pci.h>
 #include <linux/device.h>
 #include "drmP.h"
 #include "drm.h"
@@ -222,6 +223,14 @@ static struct drm_driver driver = {
 	.patchlevel = DRIVER_PATCHLEVEL,
 };
 
+/* we're going to make kms fuck off on these... */
+static struct pci_device_id i915_kms_disabled[] = {
+	{ PCI_DEVICE(0x8086, 0x2562) }, /* IS_I845G */
+	{ PCI_DEVICE(0x8086, 0x3582) }, /* IS_I855 */
+	{ PCI_DEVICE(0x8086, 0x2572) }, /* IS_I865G */
+	{ 0, }
+};
+
 static int __init i915_init(void)
 {
 	driver.num_ioctls = i915_max_ioctl;
@@ -237,7 +247,8 @@ static int __init i915_init(void)
 	 */
 #if defined(CONFIG_DRM_I915_KMS)
 	if (i915_modeset != 0)
-		driver.driver_features |= DRIVER_MODESET;
+		if (!pci_dev_present(i915_kms_disabled))
+			driver.driver_features |= DRIVER_MODESET;
 #endif
 	if (i915_modeset == 1)
 		driver.driver_features |= DRIVER_MODESET;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1625
retrieving revision 1.1626
diff -u -p -r1.1625 -r1.1626
--- kernel.spec	27 May 2009 01:23:04 -0000	1.1625
+++ kernel.spec	27 May 2009 17:30:09 -0000	1.1626
@@ -709,6 +709,7 @@ Patch1832: drm-intel-gem-use-dma32-on-pa
 Patch1833: drm-intel-i8xx-cursors.patch
 Patch1834: drm-intel-vmalloc.patch
 Patch1835: drm-copyback-ioctl-data-to-userspace-regardless-of-retcode.patch
+Patch1836: drm-intel-disable-kms-i8xx.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1384,6 +1385,7 @@ ApplyPatch drm-intel-gem-use-dma32-on-pa
 ApplyPatch drm-intel-i8xx-cursors.patch
 ApplyPatch drm-intel-vmalloc.patch
 ApplyPatch drm-copyback-ioctl-data-to-userspace-regardless-of-retcode.patch
+ApplyPatch drm-intel-disable-kms-i8xx.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -2010,7 +2012,11 @@ fi
 # and build.
 
 %changelog
-* Tue May 27 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.4-163
+* Wed May 27 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.4-164
+- drm-intel-disable-kms-i8xx.patch: disable KMS by default on 845, 855,
+  and 865. It can be forced on with i915.modeset=1 boot parameter.
+ 
+* Tue May 26 2009 Ben Skeggs <bskeggs at redhat.com> 2.6.29.4-163
 - drm-nouveau.patch: fix sor dpms (rh#501877)
 
 * Mon May 25 2009 Kyle McMartin <kyle at redhat.com> 2.6.29.4-162