From: Jonathan Cavitt <jonathan.cavitt@intel.com>
To: intel-xe@lists.freedesktop.org
Cc: saurabhg.gupta@intel.com, alex.zuo@intel.com,
jonathan.cavitt@intel.com, john.c.harrison@intel.com,
matthew.brost@intel.com, zhanjun.dong@intel.com,
alan.previn.teres.alexis@intel.com, matthew.d.roper@intel.com
Subject: [PATCH] drm/xe/xe_lrc: Rename desc to addr
Date: Tue, 12 Nov 2024 18:55:15 +0000 [thread overview]
Message-ID: <20241112185515.64060-1-jonathan.cavitt@intel.com> (raw)
The qualifier "desc" as used in the xe_lrc_snapshot struct is a legacy
term used by i915 that has been incorrectly applied to some of the
attributes. Said attributes that use the "desc" qualifier, namely
"context_desc" and "indirect_context_desc", would more accurately be
referred to as addresses, so replace the incorrect "desc" qualifier with
"addr" in these cases.
Signed-off-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
CC: John Harrison <john.c.harrison@intel.com>
CC: Matthew Brost <matthew.brost@intel.com>
CC: Zhanjun Dong <zhanjun.dong@intel.com>
CC: Alan Previn <alan.previn.teres.alexis@intel.com>
CC: Matt Roper <matthew.d.roper@intel.com>
---
drivers/gpu/drm/xe/xe_guc_capture.c | 2 +-
drivers/gpu/drm/xe/xe_lrc.c | 8 ++++----
drivers/gpu/drm/xe/xe_lrc.h | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_guc_capture.c b/drivers/gpu/drm/xe/xe_guc_capture.c
index cc72446a5de1..b95c21a18c31 100644
--- a/drivers/gpu/drm/xe/xe_guc_capture.c
+++ b/drivers/gpu/drm/xe/xe_guc_capture.c
@@ -1632,7 +1632,7 @@ xe_engine_manual_capture(struct xe_hw_engine *hwe, struct xe_hw_engine_snapshot
if (ge) {
guc_id = ge->guc.id;
if (ge->lrc[0])
- lrca = ge->lrc[0]->context_desc;
+ lrca = ge->lrc[0]->context_addr;
}
}
diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
index 4b65da77c6e0..09f0e66952e7 100644
--- a/drivers/gpu/drm/xe/xe_lrc.c
+++ b/drivers/gpu/drm/xe/xe_lrc.c
@@ -1635,8 +1635,8 @@ struct xe_lrc_snapshot *xe_lrc_snapshot_capture(struct xe_lrc *lrc)
if (lrc->bo->vm)
xe_vm_get(lrc->bo->vm);
- snapshot->context_desc = xe_lrc_ggtt_addr(lrc);
- snapshot->indirect_context_desc = xe_lrc_indirect_ring_ggtt_addr(lrc);
+ snapshot->context_addr = xe_lrc_ggtt_addr(lrc);
+ snapshot->indirect_context_addr = xe_lrc_indirect_ring_ggtt_addr(lrc);
snapshot->head = xe_lrc_ring_head(lrc);
snapshot->tail.internal = lrc->ring.tail;
snapshot->tail.memory = xe_lrc_ring_tail(lrc);
@@ -1692,9 +1692,9 @@ void xe_lrc_snapshot_print(struct xe_lrc_snapshot *snapshot, struct drm_printer
if (!snapshot)
return;
- drm_printf(p, "\tHW Context Desc: 0x%08x\n", snapshot->context_desc);
+ drm_printf(p, "\tHW Context Address: 0x%08x\n", snapshot->context_addr);
drm_printf(p, "\tHW Indirect Ring State: 0x%08x\n",
- snapshot->indirect_context_desc);
+ snapshot->indirect_context_addr);
drm_printf(p, "\tLRC Head: (memory) %u\n", snapshot->head);
drm_printf(p, "\tLRC Tail: (internal) %u, (memory) %u\n",
snapshot->tail.internal, snapshot->tail.memory);
diff --git a/drivers/gpu/drm/xe/xe_lrc.h b/drivers/gpu/drm/xe/xe_lrc.h
index 40d8f6906d3e..f6bf81009294 100644
--- a/drivers/gpu/drm/xe/xe_lrc.h
+++ b/drivers/gpu/drm/xe/xe_lrc.h
@@ -24,8 +24,8 @@ struct xe_lrc_snapshot {
void *lrc_snapshot;
unsigned long lrc_size, lrc_offset;
- u32 context_desc;
- u32 indirect_context_desc;
+ u32 context_addr;
+ u32 indirect_context_addr;
u32 head;
struct {
u32 internal;
--
2.43.0
next reply other threads:[~2024-11-12 18:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-12 18:55 Jonathan Cavitt [this message]
2024-11-12 19:08 ` [PATCH] drm/xe/xe_lrc: Rename desc to addr Cavitt, Jonathan
2024-11-12 19:57 ` Matt Roper
2024-11-12 20:38 ` John Harrison
2024-11-12 20:37 ` Rodrigo Vivi
2024-11-12 20:57 ` Souza, Jose
2024-11-13 9:23 ` ✓ CI.Patch_applied: success for " Patchwork
2024-11-13 9:23 ` ✓ CI.checkpatch: " Patchwork
2024-11-13 9:25 ` ✓ CI.KUnit: " Patchwork
2024-11-13 9:40 ` ✓ CI.Build: " Patchwork
2024-11-13 9:42 ` ✓ CI.Hooks: " Patchwork
2024-11-13 9:43 ` ✓ CI.checksparse: " Patchwork
2024-11-13 10:12 ` ✓ CI.BAT: " Patchwork
2024-11-13 12:38 ` ✗ CI.FULL: failure " Patchwork
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=20241112185515.64060-1-jonathan.cavitt@intel.com \
--to=jonathan.cavitt@intel.com \
--cc=alan.previn.teres.alexis@intel.com \
--cc=alex.zuo@intel.com \
--cc=intel-xe@lists.freedesktop.org \
--cc=john.c.harrison@intel.com \
--cc=matthew.brost@intel.com \
--cc=matthew.d.roper@intel.com \
--cc=saurabhg.gupta@intel.com \
--cc=zhanjun.dong@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.