This is a note to let you know that I've just added the patch titled
Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-drm-i915-enable-gmbus-for-post-gen2-chipsets.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.
>From 826c7e4147f902737b281e8a5a7d7aa33fd63316 Mon Sep 17 00:00:00 2001
From: Jean Delvare <kh...@linux-fr.org>
Date: Sat, 4 Jun 2011 19:34:56 +0000
Subject: Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"
From: Jean Delvare <kh...@linux-fr.org>
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 <kh...@linux-fr.org>
Reported-by: Marek Otahal <markota...@gmail.com>
Tested-by: Yermandu Patapitafious <yermandu....@gmail.com>
Tested-by: Andrew Lutomirski <l...@mit.edu>
Acked-by: Chris Wilson <ch...@chris-wilson.co.uk>
Signed-off-by: Dave Airlie <airl...@redhat.com>
Cc: Ben Hutchings <b...@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
drivers/gpu/drm/i915/intel_i2c.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- 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
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);
Patches currently in stable-queue which might be from kh...@linux-fr.org are
queue-2.6.39/hwmon-ibmaem-initialize-sysfs-attributes.patch
queue-2.6.39/hwmon-s3c-initialize-sysfs-attributes.patch
queue-2.6.39/revert-drm-i915-enable-gmbus-for-post-gen2-chipsets.patch
queue-2.6.39/hwmon-ibmpex-initialize-sysfs-attributes.patch
_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable
