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

Sync drm-intel-next with v6.0-rc as well as recent drm-intel-gt-next.

Since drm-next does not have commit f31af6a2784a ("drm/i915/guc: remove
runtime info printing from time stamp logging") yet, only
drm-intel-gt-next, will need to do that as part of the merge here to
build.

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

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

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

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

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

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

diff --cc drivers/gpu/drm/i915/gt/uc/intel_guc.c
index 2706a8c650900e661a4a178f999e9e464443d885,ab4aacc516aa407375e096dc59552b19f3af2b8d..50af247e84c42815a9bb8ee741decebd9b8f2ea3
--- 1/drivers/gpu/drm/i915/gt/uc/intel_guc.c
--- 2/drivers/gpu/drm/i915/gt/uc/intel_guc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
@@@ -389,6 -389,25 +389,23 @@@ void intel_guc_write_params(struct inte
        intel_uncore_forcewake_put(uncore, FORCEWAKE_GT);
  }
  
 -      intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
 -
+ void intel_guc_dump_time_info(struct intel_guc *guc, struct drm_printer *p)
+ {
+       struct intel_gt *gt = guc_to_gt(guc);
+       intel_wakeref_t wakeref;
+       u32 stamp = 0;
+       u64 ktime;
+ 
+       with_intel_runtime_pm(&gt->i915->runtime_pm, wakeref)
+               stamp = intel_uncore_read(gt->uncore, GUCPMTIMESTAMP);
+       ktime = ktime_get_boottime_ns();
+ 
+       drm_printf(p, "Kernel timestamp: 0x%08llX [%llu]\n", ktime, ktime);
+       drm_printf(p, "GuC timestamp: 0x%08X [%u]\n", stamp, stamp);
+       drm_printf(p, "CS timestamp frequency: %u Hz, %u ns\n",
+                  gt->clock_frequency, gt->clock_period_ns);
+ }
+ 
  int intel_guc_init(struct intel_guc *guc)
  {
        struct intel_gt *gt = guc_to_gt(guc);

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

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