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

Sync with v7.0-rc1 which contains a few treewide changes affecting i915.

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

diff --cc drivers/gpu/drm/i915/Makefile
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/gpu/drm/xe/Makefile
Simple merge

diff --cc drivers/gpu/drm/xe/display/xe_dsb_buffer.c
Simple merge

diff --cc drivers/gpu/drm/xe/xe_mmio.c
Simple merge