drm/i915: Fall back to bit banging mode for DVO transmitter detection

As discussed in this thread
http://lists.freedesktop.org/archives/dri-devel/2013-April/037411.html
GMBUS based DVO transmitter detection seems to be unreliable which could
result in an unusable DVO port.

The attached patch fixes this by falling back to bit banging mode for
the time DVO transmitter detection is in progress.

Signed-off-by: David Müller <d.mueller@elsoft.ch>
Tested-by: David Müller <d.mueller@elsoft.ch>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 12 insertions, 1 deletions

diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 00e70dbe82da..cc70b16d5d42 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -448,6 +448,7 @@ void intel_dvo_init(struct drm_device *dev)
                 const struct intel_dvo_device *dvo = &intel_dvo_devices[i];
                 struct i2c_adapter *i2c;
                 int gpio;
+                bool dvoinit;
 
                 /* Allow the I2C driver info to specify the GPIO to be used in
                  * special cases, but otherwise default to what's defined
@@ -467,7 +468,17 @@ void intel_dvo_init(struct drm_device *dev)
                 i2c = intel_gmbus_get_adapter(dev_priv, gpio);
 
                 intel_dvo->dev = *dvo;
-                if (!dvo->dev_ops->init(&intel_dvo->dev, i2c))
+
+                /* GMBUS NAK handling seems to be unstable, hence let the
+                 * transmitter detection run in bit banging mode for now.
+                 */
+                intel_gmbus_force_bit(i2c, true);
+
+                dvoinit = dvo->dev_ops->init(&intel_dvo->dev, i2c);
+
+                intel_gmbus_force_bit(i2c, false);
+
+                if (!dvoinit)
                         continue;
 
                 intel_encoder->type = INTEL_OUTPUT_DVO;