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.

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/cmd_parser.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/execlist.c
Simple merge

diff --cc drivers/gpu/drm/i915/gvt/scheduler.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_evict.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_perf.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_bios.c
index 9d5b4295343618e82784f8e1f8cd2cb23fa00cfd,5d4cd3d00564ce7a95bd02a7a5f56fbcb191337d..e809a9c347d369778e0166172523890db4d1bd79
--- 1/drivers/gpu/drm/i915/intel_bios.c
--- 2/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;

diff --cc drivers/gpu/drm/i915/intel_ddi.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_engine_cs.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc drivers/gpu/drm/msm/dsi/dsi_host.c
Simple merge

diff --cc drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_rd.c
Simple merge