]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
committerDave Airlie <airlied@redhat.com>
Thu, 16 Jun 2011 23:22:01 +0000 (09:22 +1000)
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>
drivers/gpu/drm/i915/intel_i2c.c

index d3b903bce7c5b3a25845c570aaf21f064d416224..d98cee60b602650063225ce9fbbf4f01220de562 100644 (file)
@@ -401,8 +401,7 @@ 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);
+               bus->force_bit = intel_gpio_create(dev_priv, i);
        }
 
        intel_i2c_reset(dev_priv->dev);