From: Dave Airlie <airlied@redhat.com>
Date: Thu, 2 Nov 2017 02:40:41 +0000 (+1000)
Subject: Backmerge tag 'v4.14-rc7' into drm-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7a88cbd8d65d622c00bd76ba4ae1d893b292c91c;p=linux.git

Backmerge tag 'v4.14-rc7' into drm-next

Linux 4.14-rc7

Requested by Ben Skeggs for nouveau to avoid major conflicts,
and things were getting a bit conflicty already, esp around amdgpu
reverts.
---

7a88cbd8d65d622c00bd76ba4ae1d893b292c91c
diff --cc drivers/gpu/drm/i915/intel_bios.c
index 9d5b429534361,5d4cd3d00564c..e809a9c347d36
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@@ -1115,22 -1154,22 +1115,29 @@@ static void parse_ddi_port(struct drm_i
  	if (!child)
  		return;
  
 -	aux_channel = child->common.aux_channel;
 -	ddc_pin = child->common.ddc_pin;
 +	aux_channel = child->aux_channel;
 +	ddc_pin = child->ddc_pin;
  
 -	is_dvi = child->common.device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
 -	is_dp = child->common.device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
 -	is_crt = child->common.device_type & DEVICE_TYPE_ANALOG_OUTPUT;
 -	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);
 +	is_dvi = child->device_type & DEVICE_TYPE_TMDS_DVI_SIGNALING;
 +	is_dp = child->device_type & DEVICE_TYPE_DISPLAYPORT_OUTPUT;
 +	is_crt = child->device_type & DEVICE_TYPE_ANALOG_OUTPUT;
 +	is_hdmi = is_dvi && (child->device_type & DEVICE_TYPE_NOT_HDMI_OUTPUT) == 0;
 +	is_edp = is_dp && (child->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;
 +	}
  
+ 	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;