From: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Date: Thu, 16 Apr 2020 11:35:16 +0000 (+0300)
Subject: Merge drm/drm-next into drm-intel-next-queued
X-Git-Tag: v5.8-rc1~194^2~18^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b703bbda2713fd2a7d98029ea6c44f9c3159f34;p=thirdparty%2Fkernel%2Flinux.git

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

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

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---

2b703bbda2713fd2a7d98029ea6c44f9c3159f34
diff --cc drivers/gpu/drm/i915/gt/selftest_rc6.c
index 2f3316c924a35,95b165faeba78..08c3dbd41b129
--- a/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",