Commit 826c7e41 authored Jun 04, 2011 by Jean Delvare Committed by Dave Airlie Jun 17, 2011

Revert "drm/i915: Enable GMBUS for post-gen2 chipsets"



Revert commit 8f9a3f9b. 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>

parent cafe8d84

drivers/gpu/drm/i915/intel_i2c.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -401,7 +401,6 @@ 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);
		}