diff options
| author |   jsg <jsg@openbsd.org> | 2017-10-16 02:32:09 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2017-10-16 02:32:09 +0000 |
| commit | b7cf80d2f1f12c4d31ce2366546ad488a9971fdb (patch) | |
| tree | 75fee45f640426d6e6e6d97f4b1b467863d4187e | |
| parent | Add regress test for cancellation of pthread_once()'s init_routine (diff) | |
| download | wireguard-openbsd-b7cf80d2f1f12c4d31ce2366546ad488a9971fdb.tar.xz wireguard-openbsd-b7cf80d2f1f12c4d31ce2366546ad488a9971fdb.zip | |
drm/i915/bios: ignore HDMI on port A
From Jani Nikula
33d1fa43aad4ca11f5d01ede363c1dbdd2010540 in linux 4.4.y/4.4.92
2ba7d7e0437127314864238f8bfcb8369d81075c in mainline linux
ok kettenis@
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_bios.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/i915/intel_bios.c b/sys/dev/pci/drm/i915/intel_bios.c index ed4807fdad4..1883fb3b217 100644 --- a/sys/dev/pci/drm/i915/intel_bios.c +++ b/sys/dev/pci/drm/i915/intel_bios.c @@ -963,6 +963,13 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, is_hdmi = is_dvi && (child->common.device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0; is_edp = is_dp && (child->common.device_type & DEVICE_TYPE_INTERNAL_CONNECTOR); + if (port == PORT_A && is_dvi) { + DRM_DEBUG_KMS("VBT claims port A supports DVI%s, ignoring\n", + is_hdmi ? "/HDMI" : ""); + is_dvi = false; + is_hdmi = false; + } + info->supports_dvi = is_dvi; info->supports_hdmi = is_hdmi; info->supports_dp = is_dp; |