diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-28 15:41:32 (GMT) |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-28 15:47:00 (GMT) |
| commit | b8232e906381dcba2bb26f0d849d4c25cc9b1368 (patch) | |
| tree | e3b90d6c19db323debd075c6c62b07f95c04178f /drivers/gpu/drm/i915/intel_lvds.c | |
| parent | e0e41598b433c0216814d54c62e7c1834f464d9b (diff) | |
| download | linux-fsl-qoriq-b8232e906381dcba2bb26f0d849d4c25cc9b1368.tar.xz | |
drm/i915: Disable LVDS i2c probing when using GPIO bit banging
This check only appears to succeed when using GMBUS, so we need to skip
it if we have fallen back to using GPIO bit banging.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lvds.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 98172bc..f1a6499 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c @@ -827,6 +827,9 @@ static bool intel_lvds_ddc_probe(struct drm_device *dev, u8 pin) }, }; struct i2c_adapter *i2c = &dev_priv->gmbus[pin].adapter; + /* XXX this only appears to work when using GMBUS */ + if (intel_gmbus_is_forced_bit(i2c)) + return true; return i2c_transfer(i2c, msgs, 1) == 1; } |