drm/xe/uapi: Remove XE_QUERY_CONFIG_FLAGS_USE_GUC

This config is the only real one. If execlist remains in the
code it will forever be experimental and we shouldn't maintain
an uapi like that for that experimental piece of code that
should never be used by real users.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c
index 3997c644f8fc800f1f29cc6c9a5ea1abfd73bf45..6ba7baf7c777162ab7f3a97a7038c66b1451222a 100644 (file)
--- a/drivers/gpu/drm/xe/xe_query.c
+++ b/drivers/gpu/drm/xe/xe_query.c
@@ -195,9 +195,6 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query)
        if (xe_device_get_root_tile(xe)->mem.vram.usable_size)
                config->info[XE_QUERY_CONFIG_FLAGS] =
                        XE_QUERY_CONFIG_FLAGS_HAS_VRAM;
-       if (xe->info.enable_guc)
-               config->info[XE_QUERY_CONFIG_FLAGS] |=
-                       XE_QUERY_CONFIG_FLAGS_USE_GUC;
        config->info[XE_QUERY_CONFIG_MIN_ALIGNEMENT] =
                xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K;
        config->info[XE_QUERY_CONFIG_VA_BITS] = 12 +

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index 7f29c58f87a3b68916d4e176a74d99401d614b47..259de80376b4a1469070db7da37bf98c567032ab 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -246,7 +246,6 @@ struct drm_xe_query_config {
 #define XE_QUERY_CONFIG_REV_AND_DEVICE_ID      0
 #define XE_QUERY_CONFIG_FLAGS                  1
        #define XE_QUERY_CONFIG_FLAGS_HAS_VRAM          (0x1 << 0)
-       #define XE_QUERY_CONFIG_FLAGS_USE_GUC           (0x1 << 1)
 #define XE_QUERY_CONFIG_MIN_ALIGNEMENT         2
 #define XE_QUERY_CONFIG_VA_BITS                        3
 #define XE_QUERY_CONFIG_GT_COUNT               4