drm/xe/uapi: Add IP version and stepping to GT list query

For modern platforms (MTL and later), both kernel and userspace drivers
are expected to apply GT programming and workarounds based on the IP
version and stepping self-reported by the GT hardware via the GMD_ID
registers.  Since userspace drivers can't access these registers
directly, pass along the version and stepping information via the GT
list query.  Note that the new query fields will remain 0's when running
on pre-GMD_ID platforms.  Userspace is expected to continue using PCI
devid / revid on those older platforms.

Although the hardware also has a GMD_ID register for display
version/stepping, that value is intentionally *not* included anywhere in
the Xe uapi.  Display userspace should be using platform-agnostic APIs
and auto-detecting platform capabilities rather than matching specific
IP versions.

v2:
 - s/revid/rev/  (Lucas)
 - Fix kerneldoc copy/paste mistakes

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240312211229.2871288-4-matthew.d.roper@intel.com

diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
index a6a20a6dd360e77c2b9ab374859f5b2019e02ee9..e80321b349188f02c999a4f59c53d5bc0f59f7a6 100644 (file)
--- a/drivers/gpu/drm/xe/xe_query.c
+++ b/drivers/gpu/drm/xe/xe_query.c
@@ -12,6 +12,7 @@
 #include <drm/xe_drm.h>
 
 #include "regs/xe_engine_regs.h"
+#include "regs/xe_gt_regs.h"
 #include "xe_bo.h"
 #include "xe_device.h"
 #include "xe_exec_queue.h"
@@ -401,6 +402,13 @@ static int query_gt_list(struct xe_device *xe, struct drm_xe_device_query *query
                                BIT(gt_to_tile(gt)->id) << 1;
                gt_list->gt_list[id].far_mem_regions = xe->info.mem_region_mask ^
                        gt_list->gt_list[id].near_mem_regions;
+
+               gt_list->gt_list[id].ip_ver_major =
+                       REG_FIELD_GET(GMD_ID_ARCH_MASK, gt->info.gmdid);
+               gt_list->gt_list[id].ip_ver_minor =
+                       REG_FIELD_GET(GMD_ID_RELEASE_MASK, gt->info.gmdid);
+               gt_list->gt_list[id].ip_ver_rev =
+                       REG_FIELD_GET(GMD_ID_REVID, gt->info.gmdid);
        }
 
        if (copy_to_user(query_ptr, gt_list, size)) {

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 2fc19177d2b0cb6227db686c6a21690c0d945b0d..808ad1c308ecb30fd8a2e2c6ff4809d0e6b595d6 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -459,8 +459,16 @@ struct drm_xe_gt {
         * by struct drm_xe_query_mem_regions' mem_class.
         */
        __u64 far_mem_regions;
+       /** @ip_ver_major: Graphics/media IP major version on GMD_ID platforms */
+       __u16 ip_ver_major;
+       /** @ip_ver_minor: Graphics/media IP minor version on GMD_ID platforms */
+       __u16 ip_ver_minor;
+       /** @ip_ver_rev: Graphics/media IP revision version on GMD_ID platforms */
+       __u16 ip_ver_rev;
+       /** @pad2: MBZ */
+       __u16 pad2;
        /** @reserved: Reserved */
-       __u64 reserved[8];
+       __u64 reserved[7];
 };
 
 /**