From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 2 Mar 2012 18:38:30 +0000 (+0100)
Subject: drm/i915: enable gmbus on gen2
X-Git-Tag: for-linus-20120531~58^2~140^2~76
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0fb3f969c8683505fb7323c06bf8a999a5a45a15;p=linux-2.6-block.git

drm/i915: enable gmbus on gen2

With the recent set of gmbus fixes, this seems to work on my i855gm.

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---

diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c
index 1486c76e51ac..0713cc289119 100644
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
@@ -389,10 +389,6 @@ int intel_setup_gmbus(struct drm_device *dev)
 		bus->reg0 = i | GMBUS_RATE_100KHZ;
 
 		bus->has_gpio = intel_gpio_setup(bus, i);
-
-		/* XXX force bit banging until GMBUS is fully debugged */
-		if (bus->has_gpio && IS_GEN2(dev))
-			bus->force_bit = true;
 	}
 
 	intel_i2c_reset(dev_priv->dev);