drm/xe/uapi: Standardize the FLAG naming and assignment

Only cosmetic things. No functional change on this patch.
Define every flag with (1 << n) and use singular FLAG name.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Francois Dugast <francois.dugast@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
index d495716b2c9632706ad8edea563045b3f8e42ce7..61a7d92b7e886a8758ed7277893b61f187226800 100644 (file)
--- a/drivers/gpu/drm/xe/xe_query.c
+++ b/drivers/gpu/drm/xe/xe_query.c
@@ -331,7 +331,7 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query)
                xe->info.devid | (xe->info.revid << 16);
        if (xe_device_get_root_tile(xe)->mem.vram.usable_size)
                config->info[DRM_XE_QUERY_CONFIG_FLAGS] =
-                       DRM_XE_QUERY_CONFIG_FLAGS_HAS_VRAM;
+                       DRM_XE_QUERY_CONFIG_FLAG_HAS_VRAM;
        config->info[DRM_XE_QUERY_CONFIG_MIN_ALIGNMENT] =
                xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K;
        config->info[DRM_XE_QUERY_CONFIG_VA_BITS] = xe->info.va_bits;

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 8ec12f9f41326610bc64e69dc3f1c3e835fc1804..236e643be69ae8091fa01898206be8de1fbe7436 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -323,7 +323,7 @@ struct drm_xe_query_config {
 
 #define DRM_XE_QUERY_CONFIG_REV_AND_DEVICE_ID  0
 #define DRM_XE_QUERY_CONFIG_FLAGS                      1
-       #define DRM_XE_QUERY_CONFIG_FLAGS_HAS_VRAM              (0x1 << 0)
+       #define DRM_XE_QUERY_CONFIG_FLAG_HAS_VRAM       (1 << 0)
 #define DRM_XE_QUERY_CONFIG_MIN_ALIGNMENT              2
 #define DRM_XE_QUERY_CONFIG_VA_BITS                    3
 #define DRM_XE_QUERY_CONFIG_MAX_EXEC_QUEUE_PRIORITY    4
@@ -588,10 +588,10 @@ struct drm_xe_vm_create {
        /** @extensions: Pointer to the first extension struct, if any */
        __u64 extensions;
 
-#define DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE     (0x1 << 0)
-#define DRM_XE_VM_CREATE_FLAG_COMPUTE_MODE     (0x1 << 1)
-#define DRM_XE_VM_CREATE_FLAG_ASYNC_DEFAULT    (0x1 << 2)
-#define DRM_XE_VM_CREATE_FLAG_FAULT_MODE       (0x1 << 3)
+#define DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE     (1 << 0)
+#define DRM_XE_VM_CREATE_FLAG_COMPUTE_MODE     (1 << 1)
+#define DRM_XE_VM_CREATE_FLAG_ASYNC_DEFAULT    (1 << 2)
+#define DRM_XE_VM_CREATE_FLAG_FAULT_MODE       (1 << 3)
        /** @flags: Flags */
        __u32 flags;
 
@@ -655,13 +655,13 @@ struct drm_xe_vm_bind_op {
        /** @op: Bind operation to perform */
        __u32 op;
 
-#define DRM_XE_VM_BIND_FLAG_READONLY   (0x1 << 0)
-#define DRM_XE_VM_BIND_FLAG_ASYNC      (0x1 << 1)
+#define DRM_XE_VM_BIND_FLAG_READONLY   (1 << 0)
+#define DRM_XE_VM_BIND_FLAG_ASYNC      (1 << 1)
        /*
         * Valid on a faulting VM only, do the MAP operation immediately rather
         * than deferring the MAP to the page fault handler.
         */
-#define DRM_XE_VM_BIND_FLAG_IMMEDIATE  (0x1 << 2)
+#define DRM_XE_VM_BIND_FLAG_IMMEDIATE  (1 << 2)
        /*
         * When the NULL flag is set, the page tables are setup with a special
         * bit which indicates writes are dropped and all reads return zero.  In
@@ -669,7 +669,7 @@ struct drm_xe_vm_bind_op {
         * operations, the BO handle MBZ, and the BO offset MBZ. This flag is
         * intended to implement VK sparse bindings.
         */
-#define DRM_XE_VM_BIND_FLAG_NULL       (0x1 << 3)
+#define DRM_XE_VM_BIND_FLAG_NULL       (1 << 3)
        /** @flags: Bind flags */
        __u32 flags;