From: John Harrison <John.C.Harrison@xxxxxxxxx> When trying to analyse bug reports from CI, customers, etc. it can be difficult to work out exactly what is happening on which GT in a multi-GT system. So add GT oriented debug/error message wrappers. If used instead of the drm_ equivalents, you get the same output but with a GT# prefix on it. It was also requested to extend this further to submodules in order to factor out the repeated structure accessing constructs and common string prefixes. So, add versions for GuC, HuC and GuC CTB as well. This patch set updates all the gt/uc files to use the new helpers as a first step. The intention would be to convert all output messages that have access to a GT structure. v2: Go back to using lower case names, add more wrapper sets (combined review feedback). Also, wrap up probe injection and WARN entries. v3: Split definitions out to separate header files. Tweak some messages. Wrap a couple more functions. (review feedback from Jani and Michal W). Signed-off-by: John Harrison <John.C.Harrison@xxxxxxxxx> John Harrison (5): drm/i915/gt: Start adding module oriented dmesg output drm/i915/huc: Add HuC specific debug print wrappers drm/i915/guc: Add GuC specific debug print wrappers drm/i915/guc: Add GuC CT specific debug print wrappers drm/i915/uc: Update the gt/uc code to use gt_err and friends drivers/gpu/drm/i915/gt/intel_gt.c | 96 ++++---- drivers/gpu/drm/i915/gt/intel_gt_print.h | 51 ++++ drivers/gpu/drm/i915/gt/uc/intel_guc.c | 33 ++- drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 9 +- .../gpu/drm/i915/gt/uc/intel_guc_capture.c | 49 ++-- drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 218 +++++++++--------- drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 28 ++- drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 38 +-- drivers/gpu/drm/i915/gt/uc/intel_guc_print.h | 42 ++++ drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c | 8 +- drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 56 ++--- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 63 +++-- drivers/gpu/drm/i915/gt/uc/intel_huc.c | 32 ++- drivers/gpu/drm/i915/gt/uc/intel_huc_print.h | 30 +++ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 110 +++++---- drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 99 ++++---- drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 34 +-- .../drm/i915/gt/uc/selftest_guc_hangcheck.c | 22 +- .../drm/i915/gt/uc/selftest_guc_multi_lrc.c | 10 +- 19 files changed, 549 insertions(+), 479 deletions(-) create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_print.h create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_guc_print.h create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_huc_print.h -- 2.37.3