diff options
| author | Adam Jackson | 2010-04-23 22:07:40 +0200 |
|---|---|---|
| committer | Eric Anholt | 2010-05-10 22:38:28 +0200 |
| commit | b1083333de5357577c5ec55df6c7efa17bee41c7 (patch) | |
| tree | f02a4075d3f4ee79979d0e3ff532c9a910673c09 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | Merge remote branch 'origin/master' into drm-intel-next (diff) | |
| download | kernel-qcow2-linux-b1083333de5357577c5ec55df6c7efa17bee41c7.tar.gz kernel-qcow2-linux-b1083333de5357577c5ec55df6c7efa17bee41c7.tar.xz kernel-qcow2-linux-b1083333de5357577c5ec55df6c7efa17bee41c7.zip | |
drm/i915: Fix DDC bus selection for multifunction SDVO
Multifunction SDVO cards stopped working after 14571b4, and would report
something that looked remarkably like an ADD2 SPD ROM instead of EDID.
This appears to be because DDC bus selection was utterly horked by that
commit; controlled_output was no longer always a single bit, so
intel_sdvo_select_ddc_bus would pick bus 0, which is (unsurprisingly)
the SPD ROM bus, not a DDC bus.
So, instead of that, let's just use the DDC bus the child device table
tells us to use. I'm guessing at the bitmask and shifting from VBIOS
dumps, but it can't possibly be worse.
cf. https://bugzilla.redhat.com/584229
Signed-off-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index bf11ad9998db..001e2f32be3f 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -135,6 +135,7 @@ struct sdvo_device_mapping { u8 slave_addr; u8 dvo_wiring; u8 initialized; + u8 ddc_pin; }; struct drm_i915_error_state { |