History

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.

Rodrigo Vivi committed 3 years ago

Commit c856cc11 parent c00ce7f2 files · +0 −4Browse files

Unified · Split

2 files
  1. drivers/gpu/drm/xe/xe_query.c +0 −3
  2. include/uapi/drm/xe_drm.h +0 −1
drivers/gpu/drm/xe/xe_query.c+0−3
@@ -195,9 +195,6 @@ static int query_config(struct xe_device *xe, struct drm_xe_device_query *query) · 194 unmodified lines
195 if (xe_device_get_root_tile(xe)->mem.vram.usable_size)195 if (xe_device_get_root_tile(xe)->mem.vram.usable_size)
196 config->info[XE_QUERY_CONFIG_FLAGS] =196 config->info[XE_QUERY_CONFIG_FLAGS] =
197 XE_QUERY_CONFIG_FLAGS_HAS_VRAM;197 XE_QUERY_CONFIG_FLAGS_HAS_VRAM;
198 if (xe->info.enable_guc)
199 config->info[XE_QUERY_CONFIG_FLAGS] |=
200 XE_QUERY_CONFIG_FLAGS_USE_GUC;
201 config->info[XE_QUERY_CONFIG_MIN_ALIGNEMENT] =198 config->info[XE_QUERY_CONFIG_MIN_ALIGNEMENT] =
202 xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K;199 xe->info.vram_flags & XE_VRAM_FLAGS_NEED64K ? SZ_64K : SZ_4K;
203 config->info[XE_QUERY_CONFIG_VA_BITS] = 12 +200 config->info[XE_QUERY_CONFIG_VA_BITS] = 12 +
include/uapi/drm/xe_drm.h+0−1
@@ -246,7 +246,6 @@ struct drm_xe_query_config { · 245 unmodified lines
246#define XE_QUERY_CONFIG_REV_AND_DEVICE_ID 0246#define XE_QUERY_CONFIG_REV_AND_DEVICE_ID 0
247#define XE_QUERY_CONFIG_FLAGS 1247#define XE_QUERY_CONFIG_FLAGS 1
248 #define XE_QUERY_CONFIG_FLAGS_HAS_VRAM (0x1 << 0)248 #define XE_QUERY_CONFIG_FLAGS_HAS_VRAM (0x1 << 0)
249 #define XE_QUERY_CONFIG_FLAGS_USE_GUC (0x1 << 1)
250#define XE_QUERY_CONFIG_MIN_ALIGNEMENT 2249#define XE_QUERY_CONFIG_MIN_ALIGNEMENT 2
251#define XE_QUERY_CONFIG_VA_BITS 3250#define XE_QUERY_CONFIG_VA_BITS 3
252#define XE_QUERY_CONFIG_GT_COUNT 4251#define XE_QUERY_CONFIG_GT_COUNT 4