---

yaml --- r: 307456 b: refs/heads/master c: 83ee9e6 h: refs/heads/master v: v3
git-mirror · May 19, 2012 · 9aa3b3f · 9aa3b3f
1 parent a04b7ef
commit 9aa3b3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edc912f58eaec20fd3372d9b1dab33fc28b3b3fd
+refs/heads/master: 83ee9e645846f0c56bd9b33ee28ead03b416bb25
diff --git a/trunk/drivers/gpu/drm/i915/intel_i2c.c b/trunk/drivers/gpu/drm/i915/intel_i2c.c
@@ -490,6 +490,10 @@ int intel_setup_gmbus(struct drm_device *dev)
 		/* By default use a conservative clock rate */
 		bus->reg0 = port | GMBUS_RATE_100KHZ;
 
+		/* gmbus seems to be broken on i830 */
+		if (IS_I830(dev))
+			bus->force_bit = true;
+
 		intel_gpio_setup(bus, port);
 	}