From: Michal Wajdeczko <michal.wajdeczko@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Subject: [RFC 1/7] drm/xe/guc: Promote GuC ABI headers to shared location
Date: Tue, 11 Jun 2024 16:30:02 +0200 [thread overview]
Message-ID: <20240611143008.1900-2-michal.wajdeczko@intel.com> (raw)
In-Reply-To: <20240611143008.1900-1-michal.wajdeczko@intel.com>
GuC ABI definitions do not have to be the Xe driver specific.
Move them to shared location for later reuse by the i915 driver.
While at it, fixup few improper kernel-doc annotations.
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
.../{xe => intel/guc}/abi/guc_communication_ctb_abi.h | 0
.../{xe => intel/guc}/abi/guc_communication_mmio_abi.h | 0
drivers/gpu/drm/{xe => intel/guc}/abi/guc_klvs_abi.h | 10 +++++-----
.../gpu/drm/{xe => intel/guc}/abi/guc_messages_abi.h | 0
drivers/gpu/drm/xe/Makefile | 5 +++++
5 files changed, 10 insertions(+), 5 deletions(-)
rename drivers/gpu/drm/{xe => intel/guc}/abi/guc_communication_ctb_abi.h (100%)
rename drivers/gpu/drm/{xe => intel/guc}/abi/guc_communication_mmio_abi.h (100%)
rename drivers/gpu/drm/{xe => intel/guc}/abi/guc_klvs_abi.h (98%)
rename drivers/gpu/drm/{xe => intel/guc}/abi/guc_messages_abi.h (100%)
diff --git a/drivers/gpu/drm/xe/abi/guc_communication_ctb_abi.h b/drivers/gpu/drm/intel/guc/abi/guc_communication_ctb_abi.h
similarity index 100%
rename from drivers/gpu/drm/xe/abi/guc_communication_ctb_abi.h
rename to drivers/gpu/drm/intel/guc/abi/guc_communication_ctb_abi.h
diff --git a/drivers/gpu/drm/xe/abi/guc_communication_mmio_abi.h b/drivers/gpu/drm/intel/guc/abi/guc_communication_mmio_abi.h
similarity index 100%
rename from drivers/gpu/drm/xe/abi/guc_communication_mmio_abi.h
rename to drivers/gpu/drm/intel/guc/abi/guc_communication_mmio_abi.h
diff --git a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h b/drivers/gpu/drm/intel/guc/abi/guc_klvs_abi.h
similarity index 98%
rename from drivers/gpu/drm/xe/abi/guc_klvs_abi.h
rename to drivers/gpu/drm/intel/guc/abi/guc_klvs_abi.h
index 8f9f60b28306..191995e4cb1d 100644
--- a/drivers/gpu/drm/xe/abi/guc_klvs_abi.h
+++ b/drivers/gpu/drm/intel/guc/abi/guc_klvs_abi.h
@@ -66,23 +66,23 @@
* Refers to 64 bit Global Gfx address of H2G `CT Buffer`_.
* Should be above WOPCM address but below APIC base address for native mode.
*
- * _`GUC_KLV_SELF_CFG_H2G_CTB_DESCRIPTOR_ADDR : 0x0903
+ * _`GUC_KLV_SELF_CFG_H2G_CTB_DESCRIPTOR_ADDR` : 0x0903
* Refers to 64 bit Global Gfx address of H2G `CTB Descriptor`_.
* Should be above WOPCM address but below APIC base address for native mode.
*
- * _`GUC_KLV_SELF_CFG_H2G_CTB_SIZE : 0x0904
+ * _`GUC_KLV_SELF_CFG_H2G_CTB_SIZE` : 0x0904
* Refers to size of H2G `CT Buffer`_ in bytes.
* Should be a multiple of 4K.
*
- * _`GUC_KLV_SELF_CFG_G2H_CTB_ADDR : 0x0905
+ * _`GUC_KLV_SELF_CFG_G2H_CTB_ADDR` : 0x0905
* Refers to 64 bit Global Gfx address of G2H `CT Buffer`_.
* Should be above WOPCM address but below APIC base address for native mode.
*
- * _GUC_KLV_SELF_CFG_G2H_CTB_DESCRIPTOR_ADDR : 0x0906
+ * _`GUC_KLV_SELF_CFG_G2H_CTB_DESCRIPTOR_ADDR` : 0x0906
* Refers to 64 bit Global Gfx address of G2H `CTB Descriptor`_.
* Should be above WOPCM address but below APIC base address for native mode.
*
- * _GUC_KLV_SELF_CFG_G2H_CTB_SIZE : 0x0907
+ * _`GUC_KLV_SELF_CFG_G2H_CTB_SIZE` : 0x0907
* Refers to size of G2H `CT Buffer`_ in bytes.
* Should be a multiple of 4K.
*/
diff --git a/drivers/gpu/drm/xe/abi/guc_messages_abi.h b/drivers/gpu/drm/intel/guc/abi/guc_messages_abi.h
similarity index 100%
rename from drivers/gpu/drm/xe/abi/guc_messages_abi.h
rename to drivers/gpu/drm/intel/guc/abi/guc_messages_abi.h
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile
index 478acc94a71c..a6325ee08a91 100644
--- a/drivers/gpu/drm/xe/Makefile
+++ b/drivers/gpu/drm/xe/Makefile
@@ -35,6 +35,11 @@ uses_generated_oob := \
$(uses_generated_oob): $(generated_oob)
+# Shared ABI definitions
+subdir-ccflags-y += \
+ -I$(srctree)/drivers/gpu/drm/intel/guc/ \
+ -I$(srctree)/drivers/gpu/drm/intel/guc/abi
+
# Please keep these build lists sorted!
# core driver code
--
2.43.0
next prev parent reply other threads:[~2024-06-11 14:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-11 14:30 [RFC 0/7] Promote GuC ABI headers to shared location Michal Wajdeczko
2024-06-11 14:30 ` Michal Wajdeczko [this message]
2024-06-11 14:30 ` [RFC 2/7] Documentation/gpu: Separate GuC ABI section Michal Wajdeczko
2024-06-11 14:30 ` [RFC 3/7] Documentation/gpu: Switch to shared GuC ABI definitions Michal Wajdeczko
2024-06-11 14:30 ` [RFC 4/7] drm/intel/guc: Update CTB communication ABI Michal Wajdeczko
2024-06-11 14:30 ` [RFC 5/7] drm/intel/guc: Add new KLV definitions Michal Wajdeczko
2024-06-11 14:30 ` [RFC 6/7] drm/i915: Use shared GuC ABI definitions Michal Wajdeczko
2024-06-11 14:30 ` [RFC 7/7] drm/xe: Promote SR-IOV GuC ABI definitions to shared location Michal Wajdeczko
2024-06-11 14:36 ` ✓ CI.Patch_applied: success for Promote GuC ABI headers " Patchwork
2024-06-11 14:36 ` ✗ CI.checkpatch: warning " Patchwork
2024-06-11 14:37 ` ✓ CI.KUnit: success " Patchwork
2024-06-11 14:49 ` ✓ CI.Build: " Patchwork
2024-06-11 14:51 ` ✗ CI.Hooks: failure " Patchwork
2024-06-11 14:52 ` ✗ CI.checksparse: warning " Patchwork
2024-06-11 15:13 ` [RFC 0/7] " Lucas De Marchi
2024-06-11 15:34 ` ✓ CI.BAT: success for " Patchwork
2024-06-11 17:08 ` ✗ CI.FULL: failure " Patchwork
2024-06-11 20:32 ` [RFC 0/7] " John Harrison
2024-06-11 21:45 ` Michal Wajdeczko
2024-06-11 22:12 ` Rodrigo Vivi
2024-06-12 4:12 ` Lucas De Marchi
2024-06-12 21:18 ` John Harrison
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=20240611143008.1900-2-michal.wajdeczko@intel.com \
--to=michal.wajdeczko@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
/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