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@xxxxxxxxx>
---
.../{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
