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

Backmerging in order to pull "topic/phy-compliance".

Signed-off-by: Joonas Lahtinen <[email protected]>

diff --cc drivers/gpu/drm/drm_dp_helper.c
Simple merge

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

diff --cc drivers/gpu/drm/i915/display/intel_display.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_fbdev.c
Simple merge

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

diff --cc drivers/gpu/drm/i915/gt/selftest_rc6.c
index 2f3316c924a35f09a3dd958f789cb787a1b1590c,95b165faeba78f2fe39dfa92781f1a3c37e73ddf..08c3dbd41b129aa27cb52d9b7fbf91c6e2339247
--- 1/drivers/gpu/drm/i915/gt/selftest_rc6.c
--- 2/drivers/gpu/drm/i915/gt/selftest_rc6.c
+++ b/drivers/gpu/drm/i915/gt/selftest_rc6.c
@@@ -72,11 -54,7 +72,12 @@@ int live_rc6_manual(void *arg
        msleep(1); /* wakeup is not immediate, takes about 100us on icl */
  
        res[0] = rc6_residency(rc6);
++
 +      dt = ktime_get();
 +      rc0_power = energy_uJ(rc6);
        msleep(250);
 +      rc0_power = energy_uJ(rc6) - rc0_power;
 +      dt = ktime_sub(ktime_get(), dt);
        res[1] = rc6_residency(rc6);
        if ((res[1] - res[0]) >> 10) {
                pr_err("RC6 residency increased by %lldus while disabled for 250ms!\n",

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

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

diff --cc include/drm/drm_dp_helper.h
Simple merge