drm/xe/uapi: Expose SIMD16 EU mask in topology query

PVC, Xe2 and later platforms have 16-wide EUs. We were implicitly
reporting for PVC the number of 16-wide EUs without giving userspace any
hint that they were different than for other platforms. Xe2 and later
also have 16-wide, but in those cases the reported number would
correspond to the 8-wide count.

To avoid confusion and make sure the right number is used by userspace
depending on the platform, add a new item to the topology query and drop
the one that is not available. The new mask reported for both PVC and
Xe2 should now match the numbers reported via hwconfig.

v2: Use a different topo item with EU type in its name to report the
    new mask instead of adding the type itself as the item (Matt Roper)

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Acked-by: José Roberto de Souza <jose.souza@intel.com>
Acked-by: Mateusz Jablonski <mateusz.jablonski@intel.com>
Acked-by: Wenbin Lu <wenbin.lu@intel.com>
Acked-by: Effie Yu <effie.yu@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240710220446.2169797-1-lucas.demarchi@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt_topology.c b/drivers/gpu/drm/xe/xe_gt_topology.c
index 25ff03ab84481434381fa86b617c39332966dd8f..5a1559edf3e98c2cefe8a67eb9534d2da45d66eb 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_topology.c
+++ b/drivers/gpu/drm/xe/xe_gt_topology.c
@@ -6,6 +6,7 @@
 #include "xe_gt_topology.h"
 
 #include <linux/bitmap.h>
+#include <linux/compiler.h>
 
 #include "regs/xe_gt_regs.h"
 #include "xe_assert.h"
@@ -31,7 +32,7 @@ load_dss_mask(struct xe_gt *gt, xe_dss_mask_t mask, int numregs, ...)
 }
 
 static void
-load_eu_mask(struct xe_gt *gt, xe_eu_mask_t mask)
+load_eu_mask(struct xe_gt *gt, xe_eu_mask_t mask, enum xe_gt_eu_type *eu_type)
 {
        struct xe_device *xe = gt_to_xe(gt);
        u32 reg_val = xe_mmio_read32(gt, XELP_EU_ENABLE);
@@ -47,11 +48,13 @@ load_eu_mask(struct xe_gt *gt, xe_eu_mask_t mask)
        if (GRAPHICS_VERx100(xe) < 1250)
                reg_val = ~reg_val & XELP_EU_MASK;
 
-       /* On PVC, one bit = one EU */
-       if (GRAPHICS_VERx100(xe) == 1260) {
+       if (GRAPHICS_VERx100(xe) == 1260 || GRAPHICS_VER(xe) >= 20) {
+               /* SIMD16 EUs, one bit == one EU */
+               *eu_type = XE_GT_EU_TYPE_SIMD16;
                val = reg_val;
        } else {
-               /* All other platforms, one bit = 2 EU */
+               /* SIMD8 EUs, one bit == 2 EU */
+               *eu_type = XE_GT_EU_TYPE_SIMD8;
                for (i = 0; i < fls(reg_val); i++)
                        if (reg_val & BIT(i))
                                val |= 0x3 << 2 * i;
@@ -213,7 +216,7 @@ xe_gt_topology_init(struct xe_gt *gt)
                      XEHP_GT_COMPUTE_DSS_ENABLE,
                      XEHPC_GT_COMPUTE_DSS_ENABLE_EXT,
                      XE2_GT_COMPUTE_DSS_2);
-       load_eu_mask(gt, gt->fuse_topo.eu_mask_per_dss);
+       load_eu_mask(gt, gt->fuse_topo.eu_mask_per_dss, &gt->fuse_topo.eu_type);
        load_l3_bank_mask(gt, gt->fuse_topo.l3_bank_mask);
 
        p = drm_dbg_printer(&gt_to_xe(gt)->drm, DRM_UT_DRIVER, "GT topology");
@@ -221,6 +224,18 @@ xe_gt_topology_init(struct xe_gt *gt)
        xe_gt_topology_dump(gt, &p);
 }
 
+static const char *eu_type_to_str(enum xe_gt_eu_type eu_type)
+{
+       switch (eu_type) {
+       case XE_GT_EU_TYPE_SIMD16:
+               return "simd16";
+       case XE_GT_EU_TYPE_SIMD8:
+               return "simd8";
+       }
+
+       unreachable();
+}
+
 void
 xe_gt_topology_dump(struct xe_gt *gt, struct drm_printer *p)
 {
@@ -231,6 +246,8 @@ xe_gt_topology_dump(struct xe_gt *gt, struct drm_printer *p)
 
        drm_printf(p, "EU mask per DSS:     %*pb\n", XE_MAX_EU_FUSE_BITS,
                   gt->fuse_topo.eu_mask_per_dss);
+       drm_printf(p, "EU type:             %s\n",
+                  eu_type_to_str(gt->fuse_topo.eu_type));
 
        drm_printf(p, "L3 bank mask:        %*pb\n", XE_MAX_L3_BANK_MASK_BITS,
                   gt->fuse_topo.l3_bank_mask);

diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h
index 38a0d0e178c8f77a322c3f2aec9b3232e886afd3..ef68c4a929726b0dfe3035f47c3f02685598c301 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gt_types.h
+++ b/drivers/gpu/drm/xe/xe_gt_types.h
@@ -27,6 +27,11 @@ enum xe_gt_type {
        XE_GT_TYPE_MEDIA,
 };
 
+enum xe_gt_eu_type {
+       XE_GT_EU_TYPE_SIMD8,
+       XE_GT_EU_TYPE_SIMD16,
+};
+
 #define XE_MAX_DSS_FUSE_REGS           3
 #define XE_MAX_DSS_FUSE_BITS           (32 * XE_MAX_DSS_FUSE_REGS)
 #define XE_MAX_EU_FUSE_REGS            1
@@ -343,6 +348,12 @@ struct xe_gt {
 
                /** @fuse_topo.l3_bank_mask: L3 bank mask */
                xe_l3_bank_mask_t l3_bank_mask;
+
+               /**
+                * @fuse_topo.eu_type: type/width of EU stored in
+                * fuse_topo.eu_mask_per_dss
+                */
+               enum xe_gt_eu_type eu_type;
        } fuse_topo;
 
        /** @steering: register steering for individual HW units */

diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
index 4e01df6b1b7a1d1fdecc8b59f4a8c7b0a18741c0..73ef6e4c2dc96d2a06ad04df650806c4cde57a55 100644 (file)
--- a/drivers/gpu/drm/xe/xe_query.c
+++ b/drivers/gpu/drm/xe/xe_query.c
@@ -518,7 +518,9 @@ static int query_gt_topology(struct xe_device *xe,
                if (err)
                        return err;
 
-               topo.type = DRM_XE_TOPO_EU_PER_DSS;
+               topo.type = gt->fuse_topo.eu_type == XE_GT_EU_TYPE_SIMD16 ?
+                       DRM_XE_TOPO_SIMD16_EU_PER_DSS :
+                       DRM_XE_TOPO_EU_PER_DSS;
                err = copy_mask(&query_ptr, &topo,
                                gt->fuse_topo.eu_mask_per_dss,
                                sizeof(gt->fuse_topo.eu_mask_per_dss));

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 19619d4952a863f70f1be596edf4e57089edf117..29425d7fdc77ed0a23bcf46889669f9e3886b4b9 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -517,7 +517,14 @@ struct drm_xe_query_gt_list {
  *    available per Dual Sub Slices (DSS). For example a query response
  *    containing the following in mask:
  *    ``EU_PER_DSS    ff ff 00 00 00 00 00 00``
- *    means each DSS has 16 EU.
+ *    means each DSS has 16 SIMD8 EUs. This type may be omitted if device
+ *    doesn't have SIMD8 EUs.
+ *  - %DRM_XE_TOPO_SIMD16_EU_PER_DSS - To query the mask of SIMD16 Execution
+ *    Units (EU) available per Dual Sub Slices (DSS). For example a query
+ *    response containing the following in mask:
+ *    ``SIMD16_EU_PER_DSS    ff ff 00 00 00 00 00 00``
+ *    means each DSS has 16 SIMD16 EUs. This type may be omitted if device
+ *    doesn't have SIMD16 EUs.
  */
 struct drm_xe_query_topology_mask {
        /** @gt_id: GT ID the mask is associated with */
@@ -527,6 +534,7 @@ struct drm_xe_query_topology_mask {
 #define DRM_XE_TOPO_DSS_COMPUTE                2
 #define DRM_XE_TOPO_L3_BANK            3
 #define DRM_XE_TOPO_EU_PER_DSS         4
+#define DRM_XE_TOPO_SIMD16_EU_PER_DSS  5
        /** @type: type of mask */
        __u16 type;