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>

diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
index d400e2b..5714a71 100644 (file)
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@ -320,12 +320,6 @@ static int exec_queue_set_preemption_timeout(struct xe_device *xe,
        return q->ops->set_preempt_timeout(q, value);
 }
 
-static int exec_queue_set_compute_mode(struct xe_device *xe, struct xe_exec_queue *q,
-                                      u64 value, bool create)
-{
-       return 0;
-}
-
 static int exec_queue_set_persistence(struct xe_device *xe, struct xe_exec_queue *q,
                                      u64 value, bool create)
 {
@@ -411,7 +405,6 @@ static const xe_exec_queue_set_property_fn exec_queue_set_property_funcs[] = {
        [XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY] = exec_queue_set_priority,
        [XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE] = exec_queue_set_timeslice,
        [XE_EXEC_QUEUE_SET_PROPERTY_PREEMPTION_TIMEOUT] = exec_queue_set_preemption_timeout,
-       [XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE] = exec_queue_set_compute_mode,
        [XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE] = exec_queue_set_persistence,
        [XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT] = exec_queue_set_job_timeout,
        [XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER] = exec_queue_set_acc_trigger,

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index ad21ba1..2a9e040 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -781,21 +781,14 @@ struct drm_xe_exec_queue_set_property {
        /** @exec_queue_id: Exec queue ID */
        __u32 exec_queue_id;
 
-#define XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY                    0
+#define XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY            0
 #define XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE           1
 #define XE_EXEC_QUEUE_SET_PROPERTY_PREEMPTION_TIMEOUT  2
-       /*
-        * Long running or ULLS engine mode. DMA fences not allowed in this
-        * mode. Must match the value of DRM_XE_VM_CREATE_COMPUTE_MODE, serves
-        * as a sanity check the UMD knows what it is doing. Can only be set at
-        * engine create time.
-        */
-#define XE_EXEC_QUEUE_SET_PROPERTY_COMPUTE_MODE                3
-#define XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE         4
-#define XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT         5
-#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER         6
-#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY          7
-#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY             8
+#define XE_EXEC_QUEUE_SET_PROPERTY_PERSISTENCE         3
+#define XE_EXEC_QUEUE_SET_PROPERTY_JOB_TIMEOUT         4
+#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER         5
+#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY          6
+#define XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY     7
        /** @property: property to set */
        __u32 property;