diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
| commit | 69f658e399f3d9cb9c9680afb714ba23860d7ccb (patch) | |
| tree | 13fbc42f466cb10d319514e4ddec53def8c554f6 /drivers/gpu/drm/i915/intel_bios.c | |
| parent | PM / OPP: add missing of_node_put() for of_get_cpu_node() (diff) | |
| parent | PM / Domains: Add support to select performance-state of domains (diff) | |
| download | linux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.tar.xz linux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.zip | |
Merge branch 'pm-domains' into pm-opp
Diffstat (limited to 'drivers/gpu/drm/i915/intel_bios.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 183e87e8ea31..00c6aee0a9a1 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c @@ -1163,6 +1163,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; |