[kernel] r17712 - in dists/sid/linux-2.6/debian: . patches/bugfix/x86 patches/series
Ben Hutchings
benh at alioth.debian.org
Tue Jun 21 04:29:43 UTC 2011
Author: benh
Date: Tue Jun 21 04:29:40 2011
New Revision: 17712
Log:
[x86] i915: Revert "drm/i915: Enable GMBUS for post-gen2 chipsets" (Closes: #627575)
Added:
dists/sid/linux-2.6/debian/patches/bugfix/x86/Revert-drm-i915-Enable-GMBUS-for-post-gen2-chipsets.patch
dists/sid/linux-2.6/debian/patches/series/3
Modified:
dists/sid/linux-2.6/debian/changelog
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Mon Jun 20 04:41:37 2011 (r17711)
+++ dists/sid/linux-2.6/debian/changelog Tue Jun 21 04:29:40 2011 (r17712)
@@ -1,3 +1,11 @@
+linux-2.6 (2.6.39-3) UNRELEASED; urgency=low
+
+ [ Ben Hutchings ]
+ * [x86] i915: Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"
+ (Closes: #627575)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Tue, 21 Jun 2011 05:27:43 +0100
+
linux-2.6 (2.6.39-2) unstable; urgency=low
[ Ben Hutchings ]
Added: dists/sid/linux-2.6/debian/patches/bugfix/x86/Revert-drm-i915-Enable-GMBUS-for-post-gen2-chipsets.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/x86/Revert-drm-i915-Enable-GMBUS-for-post-gen2-chipsets.patch Tue Jun 21 04:29:40 2011 (r17712)
@@ -0,0 +1,37 @@
+From: Jean Delvare <khali at linux-fr.org>
+Date: Sat, 4 Jun 2011 19:34:56 +0000
+Subject: [PATCH] Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"
+
+commit 826c7e4147f902737b281e8a5a7d7aa33fd63316 upstream.
+
+Revert commit 8f9a3f9b63b8cd3f03be9dc53533f90bd4120e5f. This fixes a
+hang when loading the eeprom driver (see bug #35572.) GMBUS will be
+re-enabled later, differently.
+
+Signed-off-by: Jean Delvare <khali at linux-fr.org>
+Reported-by: Marek Otahal <markotahal at gmail.com>
+Tested-by: Yermandu Patapitafious <yermandu.dev at gmail.com>
+Tested-by: Andrew Lutomirski <luto at mit.edu>
+Acked-by: Chris Wilson <chris at chris-wilson.co.uk>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ drivers/gpu/drm/i915/intel_i2c.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
+index d3b903b..d98cee6 100644
+--- a/drivers/gpu/drm/i915/intel_i2c.c
++++ b/drivers/gpu/drm/i915/intel_i2c.c
+@@ -401,8 +401,7 @@ int intel_setup_gmbus(struct drm_device *dev)
+ bus->reg0 = i | GMBUS_RATE_100KHZ;
+
+ /* XXX force bit banging until GMBUS is fully debugged */
+- if (IS_GEN2(dev))
+- bus->force_bit = intel_gpio_create(dev_priv, i);
++ bus->force_bit = intel_gpio_create(dev_priv, i);
+ }
+
+ intel_i2c_reset(dev_priv->dev);
+--
+1.7.5.4
+
Added: dists/sid/linux-2.6/debian/patches/series/3
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/3 Tue Jun 21 04:29:40 2011 (r17712)
@@ -0,0 +1 @@
++ bugfix/x86/Revert-drm-i915-Enable-GMBUS-for-post-gen2-chipsets.patch
More information about the Kernel-svn-changes
mailing list