Skip to content

Commit bffb257

Browse files
mbrost05rodrigovivi
authored andcommitted
drm/xe: Remove XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE from uAPI
Functionality of XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE deprecated in a previous patch, drop from uAPI. The property is just simply inherented from the VM. v2: - Update commit message (Niranjana) Reviewed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> Signed-off-by: Matthew Brost <matthew.brost@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent abce4e4 commit bffb257

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

drivers/gpu/drm/xe/xe_exec_queue.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,6 @@ static int exec_queue_set_preemption_timeout(struct xe_device *xe,
320320
return q->ops->set_preempt_timeout(q, value);
321321
}
322322

323-
static int exec_queue_set_compute_mode(struct xe_device *xe, struct xe_exec_queue *q,
324-
u64 value, bool create)
325-
{
326-
return 0;
327-
}
328-
329323
static int exec_queue_set_persistence(struct xe_device *xe, struct xe_exec_queue *q,
330324
u64 value, bool create)
331325
{
@@ -411,7 +405,6 @@ static const xe_exec_queue_set_property_fn exec_queue_set_property_funcs[] = {
411405
[XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY] = exec_queue_set_priority,
412406
[XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE] = exec_queue_set_timeslice,
413407
[XE_EXEC_QUEUE_SET_PROPERTY_PREEMPTION_TIMEOUT] = exec_queue_set_preemption_timeout,
414-
[XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE] = exec_queue_set_compute_mode,
415408
[XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE] = exec_queue_set_persistence,
416409
[XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT] = exec_queue_set_job_timeout,
417410
[XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER] = exec_queue_set_acc_trigger,

include/uapi/drm/xe_drm.h

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -781,21 +781,14 @@ struct drm_xe_exec_queue_set_property {
781781
/** @exec_queue_id: Exec queue ID */
782782
__u32 exec_queue_id;
783783

784-
#define XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY 0
784+
#define XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY 0
785785
#define XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE 1
786786
#define XE_EXEC_QUEUE_SET_PROPERTY_PREEMPTION_TIMEOUT 2
787-
/*
788-
* Long running or ULLS engine mode. DMA fences not allowed in this
789-
* mode. Must match the value of DRM_XE_VM_CREATE_COMPUTE_MODE, serves
790-
* as a sanity check the UMD knows what it is doing. Can only be set at
791-
* engine create time.
792-
*/
793-
#define XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE 3
794-
#define XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE 4
795-
#define XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT 5
796-
#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER 6
797-
#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY 7
798-
#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY 8
787+
#define XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE 3
788+
#define XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT 4
789+
#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER 5
790+
#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY 6
791+
#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY 7
799792
/** @property: property to set */
800793
__u32 property;
801794

0 commit comments

Comments
 (0)