drm/xe/uapi: Rename XE_ENGINE_PROPERTY_X to XE_ENGINE_SET_PROPERTY_X

Engine property get uAPI will be added, so to avoid ambiguity here
renaming XE_ENGINE_PROPERTY_X to XE_ENGINE_SET_PROPERTY_X.

No changes in behavior.

Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_engine.c b/drivers/gpu/drm/xe/xe_engine.c
index 63219bd98be7b86af8ec5231e74eee8d4c643c2b..1b85bf4abe3d47180406c04a3d8ee0d0fb708c4a 100644 (file)
--- a/drivers/gpu/drm/xe/xe_engine.c
+++ b/drivers/gpu/drm/xe/xe_engine.c
@@ -314,15 +314,15 @@ typedef int (*xe_engine_set_property_fn)(struct xe_device *xe,
                                         u64 value, bool create);
 
 static const xe_engine_set_property_fn engine_set_property_funcs[] = {
-       [XE_ENGINE_PROPERTY_PRIORITY] = engine_set_priority,
-       [XE_ENGINE_PROPERTY_TIMESLICE] = engine_set_timeslice,
-       [XE_ENGINE_PROPERTY_PREEMPTION_TIMEOUT] = engine_set_preemption_timeout,
-       [XE_ENGINE_PROPERTY_COMPUTE_MODE] = engine_set_compute_mode,
-       [XE_ENGINE_PROPERTY_PERSISTENCE] = engine_set_persistence,
-       [XE_ENGINE_PROPERTY_JOB_TIMEOUT] = engine_set_job_timeout,
-       [XE_ENGINE_PROPERTY_ACC_TRIGGER] = engine_set_acc_trigger,
-       [XE_ENGINE_PROPERTY_ACC_NOTIFY] = engine_set_acc_notify,
-       [XE_ENGINE_PROPERTY_ACC_GRANULARITY] = engine_set_acc_granularity,
+       [XE_ENGINE_SET_PROPERTY_PRIORITY] = engine_set_priority,
+       [XE_ENGINE_SET_PROPERTY_TIMESLICE] = engine_set_timeslice,
+       [XE_ENGINE_SET_PROPERTY_PREEMPTION_TIMEOUT] = engine_set_preemption_timeout,
+       [XE_ENGINE_SET_PROPERTY_COMPUTE_MODE] = engine_set_compute_mode,
+       [XE_ENGINE_SET_PROPERTY_PERSISTENCE] = engine_set_persistence,
+       [XE_ENGINE_SET_PROPERTY_JOB_TIMEOUT] = engine_set_job_timeout,
+       [XE_ENGINE_SET_PROPERTY_ACC_TRIGGER] = engine_set_acc_trigger,
+       [XE_ENGINE_SET_PROPERTY_ACC_NOTIFY] = engine_set_acc_notify,
+       [XE_ENGINE_SET_PROPERTY_ACC_GRANULARITY] = engine_set_acc_granularity,
 };
 
 static int engine_user_ext_set_property(struct xe_device *xe,

diff --git a/include/uapi/drm/xe_drm.h b/include/uapi/drm/xe_drm.h
index f64b1c785fad90ff3032859b7776cdebef0130ad..8dc8ebbaf337a2b6f79742f86f720450b3ec5512 100644 (file)
--- a/include/uapi/drm/xe_drm.h
+++ b/include/uapi/drm/xe_drm.h
@@ -511,21 +511,21 @@ struct drm_xe_engine_set_property {
        __u32 engine_id;
 
        /** @property: property to set */
-#define XE_ENGINE_PROPERTY_PRIORITY                    0
-#define XE_ENGINE_PROPERTY_TIMESLICE                   1
-#define XE_ENGINE_PROPERTY_PREEMPTION_TIMEOUT          2
+#define XE_ENGINE_SET_PROPERTY_PRIORITY                        0
+#define XE_ENGINE_SET_PROPERTY_TIMESLICE               1
+#define XE_ENGINE_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_ENGINE_PROPERTY_COMPUTE_MODE                        3
-#define XE_ENGINE_PROPERTY_PERSISTENCE                 4
-#define XE_ENGINE_PROPERTY_JOB_TIMEOUT                 5
-#define XE_ENGINE_PROPERTY_ACC_TRIGGER                 6
-#define XE_ENGINE_PROPERTY_ACC_NOTIFY                  7
-#define XE_ENGINE_PROPERTY_ACC_GRANULARITY             8
+#define XE_ENGINE_SET_PROPERTY_COMPUTE_MODE            3
+#define XE_ENGINE_SET_PROPERTY_PERSISTENCE             4
+#define XE_ENGINE_SET_PROPERTY_JOB_TIMEOUT             5
+#define XE_ENGINE_SET_PROPERTY_ACC_TRIGGER             6
+#define XE_ENGINE_SET_PROPERTY_ACC_NOTIFY              7
+#define XE_ENGINE_SET_PROPERTY_ACC_GRANULARITY         8
        __u32 property;
 
        /** @value: property value */