drm/xe/uapi: Define topology types as indexes rather than masks

The topology type is an index (not a mask) so define the values
like other indexes instead of using powers of 2. This is also
to make clear that the next type can use value 3. This commit
does not change the existing values so it does not break
compatibility.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Suggested-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Francois Dugast <francois.dugast@intel.com>
Link: https://lore.kernel.org/intel-xe/20240327232317.GI718896@mdroper-desk1.amr.corp.intel.com/
Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240328140243.7-1-francois.dugast@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 808ad1c308ecb30fd8a2e2c6ff4809d0e6b595d6..95a8ecca21f48add13c6302e3406c63161ab5166 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -518,9 +518,9 @@ struct drm_xe_query_topology_mask {
        /** @gt_id: GT ID the mask is associated with */
        __u16 gt_id;
 
-#define DRM_XE_TOPO_DSS_GEOMETRY       (1 << 0)
-#define DRM_XE_TOPO_DSS_COMPUTE                (1 << 1)
-#define DRM_XE_TOPO_EU_PER_DSS         (1 << 2)
+#define DRM_XE_TOPO_DSS_GEOMETRY       1
+#define DRM_XE_TOPO_DSS_COMPUTE                2
+#define DRM_XE_TOPO_EU_PER_DSS         4
        /** @type: type of mask */
        __u16 type;