Skip to content

Commit 0de009c

Browse files
icklekeith-packard
authored andcommitted
drm/i915/crt: Remove 0xa0 probe for VGA
This is a moral revert of 6ec3d0c. Following the fix to reset the GMBUS controller after a NAK, we finally utilize the 0xa0 probe for a CRT connection. And discover that the code is broken. Shock. There are a number of issues, but following a key insight from Dave Airlie, that 0xA0 is an invalid address on a 7-bit bus (though not if we were to enable 10-bit addressing), and would look like the EDID port 0x50, it is possible to see where the confusion starts. In short, a write to 0xA0 is accepted by the GMBUS controller which we interpreted as meaning the existence of a connection (a slave on the other end of the wire ACKing the write). That was false. During testing with a broken GMBUS implementation, which never reset an earlier NAK, this test always reported a NAK and so we proceeded on to the next test. Reported-and-tested-by: Sitsofe Wheeler <sitsofe@yahoo.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35904 Reported-and-tested-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=32612 Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Acked-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Keith Packard <keithp@keithp.com>
1 parent 7f58aab commit 0de009c

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

drivers/gpu/drm/i915/intel_crt.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -269,21 +269,6 @@ static bool intel_crt_detect_hotplug(struct drm_connector *connector)
269269
return ret;
270270
}
271271

272-
static bool intel_crt_ddc_probe(struct drm_i915_private *dev_priv, int ddc_bus)
273-
{
274-
u8 buf;
275-
struct i2c_msg msgs[] = {
276-
{
277-
.addr = 0xA0,
278-
.flags = 0,
279-
.len = 1,
280-
.buf = &buf,
281-
},
282-
};
283-
/* DDC monitor detect: Does it ACK a write to 0xA0? */
284-
return i2c_transfer(&dev_priv->gmbus[ddc_bus].adapter, msgs, 1) == 1;
285-
}
286-
287272
static bool intel_crt_detect_ddc(struct drm_connector *connector)
288273
{
289274
struct intel_crt *crt = intel_attached_crt(connector);
@@ -293,11 +278,6 @@ static bool intel_crt_detect_ddc(struct drm_connector *connector)
293278
if (crt->base.type != INTEL_OUTPUT_ANALOG)
294279
return false;
295280

296-
if (intel_crt_ddc_probe(dev_priv, dev_priv->crt_ddc_pin)) {
297-
DRM_DEBUG_KMS("CRT detected via DDC:0xa0\n");
298-
return true;
299-
}
300-
301281
if (intel_ddc_probe(&crt->base, dev_priv->crt_ddc_pin)) {
302282
struct edid *edid;
303283
bool is_digital = false;

0 commit comments

Comments
 (0)