Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Badal Nilawar <badal.nilawar@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: anshuman.gupta@intel.com, john.c.harrison@intel.com
Subject: [CI 02/12] drm/xe/devcoredump: Use drm_puts and already cached local variables
Date: Fri, 20 Sep 2024 19:59:12 +0530	[thread overview]
Message-ID: <20240920142922.618649-3-badal.nilawar@intel.com> (raw)
In-Reply-To: <20240920142922.618649-1-badal.nilawar@intel.com>

From: John Harrison <John.C.Harrison@Intel.com>

There are a bunch of calls to drm_printf with static strings. Switch
them to drm_puts instead.

There are also a bunch of 'coredump->snapshot.XXX' references when
'coredump->snapshot' has alread been cached locally as 'ss'. So use
'ss->XXX' instead.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
---
 drivers/gpu/drm/xe/xe_devcoredump.c | 40 ++++++++++++++---------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
index bdb76e834e4c..d23719d5c2a3 100644
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c
@@ -85,9 +85,9 @@ static ssize_t __xe_devcoredump_read(char *buffer, size_t count,
 
 	p = drm_coredump_printer(&iter);
 
-	drm_printf(&p, "**** Xe Device Coredump ****\n");
-	drm_printf(&p, "kernel: " UTS_RELEASE "\n");
-	drm_printf(&p, "module: " KBUILD_MODNAME "\n");
+	drm_puts(&p, "**** Xe Device Coredump ****\n");
+	drm_puts(&p, "kernel: " UTS_RELEASE "\n");
+	drm_puts(&p, "module: " KBUILD_MODNAME "\n");
 
 	ts = ktime_to_timespec64(ss->snapshot_time);
 	drm_printf(&p, "Snapshot time: %lld.%09ld\n", ts.tv_sec, ts.tv_nsec);
@@ -96,20 +96,20 @@ static ssize_t __xe_devcoredump_read(char *buffer, size_t count,
 	drm_printf(&p, "Process: %s\n", ss->process_name);
 	xe_device_snapshot_print(xe, &p);
 
-	drm_printf(&p, "\n**** GuC CT ****\n");
-	xe_guc_ct_snapshot_print(coredump->snapshot.ct, &p);
-	xe_guc_exec_queue_snapshot_print(coredump->snapshot.ge, &p);
+	drm_puts(&p, "\n**** GuC CT ****\n");
+	xe_guc_ct_snapshot_print(ss->ct, &p);
+	xe_guc_exec_queue_snapshot_print(ss->ge, &p);
 
-	drm_printf(&p, "\n**** Job ****\n");
-	xe_sched_job_snapshot_print(coredump->snapshot.job, &p);
+	drm_puts(&p, "\n**** Job ****\n");
+	xe_sched_job_snapshot_print(ss->job, &p);
 
-	drm_printf(&p, "\n**** HW Engines ****\n");
+	drm_puts(&p, "\n**** HW Engines ****\n");
 	for (i = 0; i < XE_NUM_HW_ENGINES; i++)
-		if (coredump->snapshot.hwe[i])
-			xe_hw_engine_snapshot_print(coredump->snapshot.hwe[i],
-						    &p);
-	drm_printf(&p, "\n**** VM state ****\n");
-	xe_vm_snapshot_print(coredump->snapshot.vm, &p);
+		if (ss->hwe[i])
+			xe_hw_engine_snapshot_print(ss->hwe[i], &p);
+
+	drm_puts(&p, "\n**** VM state ****\n");
+	xe_vm_snapshot_print(ss->vm, &p);
 
 	return count - iter.remain;
 }
@@ -247,18 +247,18 @@ static void devcoredump_snapshot(struct xe_devcoredump *coredump,
 	if (xe_force_wake_get(gt_to_fw(q->gt), XE_FORCEWAKE_ALL))
 		xe_gt_info(ss->gt, "failed to get forcewake for coredump capture\n");
 
-	coredump->snapshot.ct = xe_guc_ct_snapshot_capture(&guc->ct, true);
-	coredump->snapshot.ge = xe_guc_exec_queue_snapshot_capture(q);
-	coredump->snapshot.job = xe_sched_job_snapshot_capture(job);
-	coredump->snapshot.vm = xe_vm_snapshot_capture(q->vm);
+	ss->ct = xe_guc_ct_snapshot_capture(&guc->ct, true);
+	ss->ge = xe_guc_exec_queue_snapshot_capture(q);
+	ss->job = xe_sched_job_snapshot_capture(job);
+	ss->vm = xe_vm_snapshot_capture(q->vm);
 
 	for_each_hw_engine(hwe, q->gt, id) {
 		if (hwe->class != q->hwe->class ||
 		    !(BIT(hwe->logical_instance) & adj_logical_mask)) {
-			coredump->snapshot.hwe[id] = NULL;
+			ss->hwe[id] = NULL;
 			continue;
 		}
-		coredump->snapshot.hwe[id] = xe_hw_engine_snapshot_capture(hwe);
+		ss->hwe[id] = xe_hw_engine_snapshot_capture(hwe);
 	}
 
 	queue_work(system_unbound_wq, &ss->work);
-- 
2.34.1


  parent reply	other threads:[~2024-09-20 14:09 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-20 14:29 [CI 00/12] Debug g2h timeout issue Badal Nilawar
2024-09-20 14:29 ` [CI 01/12] drm/xe/guc: Remove spurious line feed in debug print Badal Nilawar
2024-09-20 14:29 ` Badal Nilawar [this message]
2024-09-20 14:29 ` [CI 03/12] drm/xe/devcoredump: Improve section headings and add tile info Badal Nilawar
2024-09-20 14:29 ` [CI 04/12] drm/xe/devcoredump: Add ASCII85 dump helper function Badal Nilawar
2024-09-20 14:29 ` [CI 05/12] drm/xe/guc: Copy GuC log prior to dumping Badal Nilawar
2024-09-20 14:29 ` [CI 06/12] drm/xe/guc: Use a two stage dump for GuC logs and add more info Badal Nilawar
2024-09-20 14:29 ` [CI 07/12] drm/print: Introduce drm_line_printer Badal Nilawar
2024-09-20 14:29 ` [CI 08/12] drm/xe/guc: Dead CT helper Badal Nilawar
2024-09-20 14:29 ` [CI 09/12] drm/xe/guc: Dump entire CTB on errors Badal Nilawar
2024-09-20 14:29 ` [CI 10/12] drm/xe/guc: Add GuC log to devcoredump captures Badal Nilawar
2024-09-20 14:29 ` [CI 11/12] drm/xe/guc: Add a helper function for dumping GuC log to dmesg Badal Nilawar
2024-09-20 14:29 ` [CI 12/12] [For CI] Debug prints/logs to debug G2H timeout issue Badal Nilawar
2024-09-23 17:09   ` John Harrison
2024-09-20 14:48 ` [CI 00/12] Debug g2h " Jani Nikula
2024-09-23 19:45   ` John Harrison
2024-09-26 18:55     ` Rodrigo Vivi
2024-09-27 17:50       ` Nilawar, Badal
2024-09-20 15:24 ` ✓ CI.Patch_applied: success for " Patchwork
2024-09-20 15:24 ` ✗ CI.checkpatch: warning " Patchwork
2024-09-20 15:25 ` ✓ CI.KUnit: success " Patchwork
2024-09-20 15:37 ` ✓ CI.Build: " Patchwork
2024-09-20 15:39 ` ✓ CI.Hooks: " Patchwork
2024-09-20 15:41 ` ✗ CI.checksparse: warning " Patchwork
2024-09-20 16:10 ` ✓ CI.BAT: success " Patchwork
2024-09-20 21:21 ` ✓ CI.FULL: " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2024-09-20 14:06 [[CI] 00/12] " bnilawar
2024-09-20 14:06 ` [[CI] 02/12] drm/xe/devcoredump: Use drm_puts and already cached local variables bnilawar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240920142922.618649-3-badal.nilawar@intel.com \
    --to=badal.nilawar@intel.com \
    --cc=anshuman.gupta@intel.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=john.c.harrison@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox