[x86] i915: Revert "drm/i915: Enable GMBUS for post-gen2 chipsets" (Closes: #627575)
svn path=/dists/sid/linux-2.6/; revision=17712
This commit is contained in:
parent
8800850d67
commit
33318598c4
|
@ -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@decadent.org.uk> Tue, 21 Jun 2011 05:27:43 +0100
|
||||
|
||||
linux-2.6 (2.6.39-2) unstable; urgency=low
|
||||
|
||||
[ Ben Hutchings ]
|
||||
|
|
37
debian/patches/bugfix/x86/Revert-drm-i915-Enable-GMBUS-for-post-gen2-chipsets.patch
vendored
Normal file
37
debian/patches/bugfix/x86/Revert-drm-i915-Enable-GMBUS-for-post-gen2-chipsets.patch
vendored
Normal file
|
@ -0,0 +1,37 @@
|
|||
From: Jean Delvare <khali@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@linux-fr.org>
|
||||
Reported-by: Marek Otahal <markotahal@gmail.com>
|
||||
Tested-by: Yermandu Patapitafious <yermandu.dev@gmail.com>
|
||||
Tested-by: Andrew Lutomirski <luto@mit.edu>
|
||||
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
|
||||
Signed-off-by: Dave Airlie <airlied@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
|
||||
|
|
@ -0,0 +1 @@
|
|||
+ bugfix/x86/Revert-drm-i915-Enable-GMBUS-for-post-gen2-chipsets.patch
|
Loading…
Reference in New Issue