[kernel] r16176 - in dists/sid/linux-2.6/debian: . patches/debian patches/series

[Ben Hutchings]

Author: benh
Date: Tue Aug 24 05:11:37 2010
New Revision: 16176

Log:
[x86] i915: Blacklist i830, i845, i855 for KMS (Closes: #568207, #582105, #593432, #593507)

Added:
   dists/sid/linux-2.6/debian/patches/debian/i915-Blacklist-i830-i845-i855-for-KMS.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/21

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Aug 24 04:49:35 2010	(r16175)
+++ dists/sid/linux-2.6/debian/changelog	Tue Aug 24 05:11:37 2010	(r16176)
@@ -14,6 +14,8 @@
   * Add drm and other relevant changes from stable 2.6.34.4
   * Add 'breaks' relation from image packages to boot loader packages that
     do not install required hooks (Closes: #593683)
+  * [x86] i915: Blacklist i830, i845, i855 for KMS
+    (Closes: #568207, #582105, #593432, #593507)
 
   [ Bastian Blank ]
   * Update Xen patch.

Added: dists/sid/linux-2.6/debian/patches/debian/i915-Blacklist-i830-i845-i855-for-KMS.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/debian/i915-Blacklist-i830-i845-i855-for-KMS.patch	Tue Aug 24 05:11:37 2010	(r16176)
@@ -0,0 +1,44 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 19 Aug 2010 02:55:33 +0100
+Subject: [PATCH] i915: Blacklist i830, i845, i855 for KMS
+
+Based on work by Andy Whitcroft <apw at canonical.com>.
+
+We need to support partial upgrades in Debian so we require the X
+driver to explicitly enable KMS by setting module parameter modeset=1.
+Therefore this does not provide a means to override the blacklist.
+---
+ drivers/gpu/drm/i915/i915_drv.c |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -544,6 +544,15 @@ static struct drm_driver driver = {
+ 	.patchlevel = DRIVER_PATCHLEVEL,
+ };
+ 
++/* KMS is reported to be unreliable for these devices */
++static const struct pci_device_id i915_kms_blacklist[] = {
++	INTEL_VGA_DEVICE(0x3577, 0),	/* i830 */
++	INTEL_VGA_DEVICE(0x2562, 0),	/* i845 */
++	INTEL_VGA_DEVICE(0x3582, 0),	/* i855 */
++	INTEL_VGA_DEVICE(0x358e, 0),	/* i855 */
++	{ },
++};
++
+ static int __init i915_init(void)
+ {
+ 	driver.num_ioctls = i915_max_ioctl;
+@@ -566,6 +575,12 @@ static int __init i915_init(void)
+ 	if (i915_modeset == 1)
+ 		driver.driver_features |= DRIVER_MODESET;
+ 
++	if ((driver.driver_features & DRIVER_MODESET) &&
++	    pci_dev_present(i915_kms_blacklist)) {
++		DRM_INFO("KMS is not supported on this GPU\n");
++		driver.driver_features &= ~DRIVER_MODESET;
++	}
++
+ #ifdef CONFIG_VGA_CONSOLE
+ 	if (vgacon_text_force() && i915_modeset == -1)
+ 		driver.driver_features &= ~DRIVER_MODESET;

Modified: dists/sid/linux-2.6/debian/patches/series/21
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/21	Tue Aug 24 04:49:35 2010	(r16175)
+++ dists/sid/linux-2.6/debian/patches/series/21	Tue Aug 24 05:11:37 2010	(r16176)
@@ -23,3 +23,4 @@
 + features/all/xen/pvhvm/0012-blkfront-do-not-create-a-PV-cdrom-device-if-xen_hvm.patch
 + features/all/xen/pvhvm/0013-Introduce-CONFIG_XEN_PVHVM-compile-option.patch
 + features/all/xen/pvhvm/0014-pvops-do-not-notify-callers-from-register_xenstore_.patch
++ debian/i915-Blacklist-i830-i845-i855-for-KMS.patch