History

Merge tag 'drm-xe-next-2026-01-15' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next

UAPI Changes: - Remove unused KEEP_ACTIVE flag in the new multi queue uAPI (Niranjana) - Expose new temperature attributes in HWMON (Karthik) Driver Changes: - Force i2c into polling mode when in survivability (Raag) - Validate preferred system memory placement in xe_svm_range_validate (Brost) - Adjust page count tracepoints in shrinker (Brost) - Fix a couple drm_pagemap issues with multi-GPU (Brost) - Define GuC firmware for NVL-S (Roper) - Handle GT resume failure (Raag) - Improve wedged mode handling (Lukasz) - Add missing newlines to drm_warn messages (Osama) - Fix WQ_MEM_RECLAIM passed as max_active to alloc_workqueue (Marco) - Page-reclaim fixes and PRL stats addition (Brian) - Fix struct guc_lfd_file_header kernel-doc (Jani) - Allow compressible surfaces to be 1-way coherent (Xin) - Fix DRM scheduler layering violations in Xe (Brost) - Minor improvements to MERT code (Michal) - Privatize struct xe_ggtt_node (Maarten) - Convert wait for lmem init into an assert (Bala) - Enable GSC loading and PXP for PTL (Daniele) - Replace use of system_wq with tlb_inval->timeout_wq (Marco) - VRAM addr range bit expansion (Fei) - Cleanup unused header includes (Roper) Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 9 months ago

Commit 971c2b62 parents 9d10cd5 8367585134 files · +1391 −973Browse files

Showing the changes to include/uapi (1 of 134 files). Show all

Unified · Split

include/uapi/drm/xe_drm.h+0−4
@@ -1280,9 +1280,6 @@ struct drm_xe_vm_bind { · 1279 unmodified lines
1280 * then a new multi-queue group is created with this queue as the primary queue1280 * then a new multi-queue group is created with this queue as the primary queue
1281 * (Q0). Otherwise, the queue gets added to the multi-queue group whose primary1281 * (Q0). Otherwise, the queue gets added to the multi-queue group whose primary
1282 * queue's exec_queue_id is specified in the lower 32 bits of the 'value' field.1282 * queue's exec_queue_id is specified in the lower 32 bits of the 'value' field.
1283 * If the extension's 'value' field has %DRM_XE_MULTI_GROUP_KEEP_ACTIVE flag
1284 * set, then the multi-queue group is kept active after the primary queue is
1285 * destroyed.
1286 * All the other non-relevant bits of extension's 'value' field while adding the1283 * All the other non-relevant bits of extension's 'value' field while adding the
1287 * primary or the secondary queues of the group must be set to 0.1284 * primary or the secondary queues of the group must be set to 0.
1288 * - %DRM_XE_EXEC_QUEUE_SET_PROPERTY_MULTI_QUEUE_PRIORITY - Set the queue1285 * - %DRM_XE_EXEC_QUEUE_SET_PROPERTY_MULTI_QUEUE_PRIORITY - Set the queue
@@ -1331,7 +1328,6 @@ struct drm_xe_exec_queue_create { · 42 unmodified lines
1331#define DRM_XE_EXEC_QUEUE_SET_HANG_REPLAY_STATE 31328#define DRM_XE_EXEC_QUEUE_SET_HANG_REPLAY_STATE 3
1332#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_MULTI_GROUP 41329#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_MULTI_GROUP 4
1333#define DRM_XE_MULTI_GROUP_CREATE (1ull << 63)1330#define DRM_XE_MULTI_GROUP_CREATE (1ull << 63)
1334#define DRM_XE_MULTI_GROUP_KEEP_ACTIVE (1ull << 62)
1335#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_MULTI_QUEUE_PRIORITY 51331#define DRM_XE_EXEC_QUEUE_SET_PROPERTY_MULTI_QUEUE_PRIORITY 5
1336 /** @extensions: Pointer to the first extension struct, if any */1332 /** @extensions: Pointer to the first extension struct, if any */
1337 __u64 extensions;1333 __u64 extensions;