OSDN Git Service

Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"
authorJean Delvare <khali@linux-fr.org>
Sat, 4 Jun 2011 19:34:56 +0000 (19:34 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 9 Jul 2011 06:14:59 +0000 (23:14 -0700)
commit699ea72e02ecd0fc22e9059b04082ef613f92126
treedb0623969b40130ceb66e89f20de4897ec6cdcc1
parentd631323f1151c09c21985cb1bba8a17eba83ad99
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>
Cc: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/gpu/drm/i915/intel_i2c.c