Merge drm/drm-next into drm-intel-next

Sync to fix conlicts between drm-xe-next and drm-intel-next.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>

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

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

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

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

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

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

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

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

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

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

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