summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2013-03-31 14:18:39 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2013-03-31 14:18:39 +0000
commitd5317b4a4275b1f225bc9c96c0624448ad7b972b (patch)
treef77e522997f432189cf92e4991e3795eaa42bc9d /sys
parent41f384eeba90a51783b200ccd598f48e3baca7f6 (diff)
Resort to I2C bit-banging on the SDVO port like Linux does. Using GMBUS simply
doesn't work reliably. On some machines you can talk to the SDVO chip, but not to the DDC channel associated with it. On others ou can't even reliably communicate with the SDVO chip. Might make all sorts of digital video ports (DVI, HDMI) work. Some systems need further changes to adjust timings in the I2C bit-banging code.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/drm/i915/intel_sdvo.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/pci/drm/i915/intel_sdvo.c b/sys/dev/pci/drm/i915/intel_sdvo.c
index 4c912ee8d50..7899b73be53 100644
--- a/sys/dev/pci/drm/i915/intel_sdvo.c
+++ b/sys/dev/pci/drm/i915/intel_sdvo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intel_sdvo.c,v 1.5 2013/03/31 08:32:43 kettenis Exp $ */
+/* $OpenBSD: intel_sdvo.c,v 1.6 2013/03/31 14:18:38 kettenis Exp $ */
/*
* Copyright 2006 Dave Airlie <airlied@linux.ie>
* Copyright © 2006-2007 Intel Corporation
@@ -2318,21 +2318,17 @@ intel_sdvo_select_i2c_bus(struct inteldrm_softc *dev_priv,
sdvo->i2c = intel_gmbus_get_adapter(dev_priv, pin);
-#ifdef notyet
/* With gmbus we should be able to drive sdvo i2c at 2MHz, but somehow
* our code totally fails once we start using gmbus. Hence fall back to
* bit banging for now. */
intel_gmbus_force_bit(sdvo->i2c, true);
-#endif
}
/* undo any changes intel_sdvo_select_i2c_bus() did to sdvo->i2c */
void
intel_sdvo_unselect_i2c_bus(struct intel_sdvo *sdvo)
{
-#ifdef notyet
intel_gmbus_force_bit(sdvo->i2c, false);
-#endif
}
bool