From: Jani Nikula <jani.nikula@intel.com>
Date: Mon, 29 Aug 2022 11:44:38 +0000 (+0300)
Subject: Merge drm/drm-next into drm-intel-next
X-Git-Tag: block-6.1-2022-13-10~35^2~14^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=917bda9ab155032a02be1a57ebd4d949ae9e1528;p=linux-block.git

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 f0c70d41e4e8 ("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>
---

917bda9ab155032a02be1a57ebd4d949ae9e1528
diff --cc drivers/gpu/drm/i915/gt/uc/intel_guc.c
index 2706a8c65090,ab4aacc516aa..50af247e84c4
--- a/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);
  }
  
+ 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;
+ 
 -	intel_device_info_print_runtime(RUNTIME_INFO(gt->i915), p);
 -
+ 	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);