Commit 0f1d88f2 authored by Rodrigo Vivi's avatar Rodrigo Vivi
Browse files

drm/xe/uapi: Kill exec_queue_set_property 



All the properties should be immutable and set upon exec_queue creation
using the existent extension. So, let's kill this useless and dangerous
uapi.

Cc: Francois Dugast <francois.dugast@intel.com>
Cc: José Roberto de Souza <jose.souza@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: default avatarJosé Roberto de Souza <jose.souza@intel.com>
Signed-off-by: default avatarFrancois Dugast <francois.dugast@intel.com>
parent 9209fbed

drivers/gpu/drm/xe/xe_device.c

+0 −2
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ static const struct drm_ioctl_desc xe_ioctls[] = { 
			  DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(XE_EXEC_QUEUE_DESTROY, xe_exec_queue_destroy_ioctl,

			  DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(XE_EXEC_QUEUE_SET_PROPERTY, xe_exec_queue_set_property_ioctl,

			  DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(XE_EXEC_QUEUE_GET_PROPERTY, xe_exec_queue_get_property_ioctl,

			  DRM_RENDER_ALLOW),

	DRM_IOCTL_DEF_DRV(XE_WAIT_USER_FENCE, xe_wait_user_fence_ioctl,

drivers/gpu/drm/xe/xe_exec_queue.c

+0 −38
Original line number Diff line number Diff line
@@ -883,44 +883,6 @@ int xe_exec_queue_destroy_ioctl(struct drm_device *dev, void *data, 
	return 0;

}



int xe_exec_queue_set_property_ioctl(struct drm_device *dev, void *data,

				     struct drm_file *file)

{

	struct xe_device *xe = to_xe_device(dev);

	struct xe_file *xef = to_xe_file(file);

	struct drm_xe_exec_queue_set_property *args = data;

	struct xe_exec_queue *q;

	int ret;

	u32 idx;



	if (XE_IOCTL_DBG(xe, args->reserved[0] || args->reserved[1]))

		return -EINVAL;



	q = xe_exec_queue_lookup(xef, args->exec_queue_id);

	if (XE_IOCTL_DBG(xe, !q))

		return -ENOENT;



	if (XE_IOCTL_DBG(xe, args->property >=

			 ARRAY_SIZE(exec_queue_set_property_funcs))) {

		ret = -EINVAL;

		goto out;

	}



	idx = array_index_nospec(args->property,

				 ARRAY_SIZE(exec_queue_set_property_funcs));

	ret = exec_queue_set_property_funcs[idx](xe, q, args->value, false);

	if (XE_IOCTL_DBG(xe, ret))

		goto out;



	if (args->extensions)

		ret = exec_queue_user_extensions(xe, q, args->extensions, 0,

						 false);

out:

	xe_exec_queue_put(q);



	return ret;

}



static void xe_exec_queue_last_fence_lockdep_assert(struct xe_exec_queue *q,

						    struct xe_vm *vm)

{

drivers/gpu/drm/xe/xe_exec_queue.h

+0 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ int xe_exec_queue_create_ioctl(struct drm_device *dev, void *data, 
			       struct drm_file *file);

int xe_exec_queue_destroy_ioctl(struct drm_device *dev, void *data,

				struct drm_file *file);

int xe_exec_queue_set_property_ioctl(struct drm_device *dev, void *data,

				     struct drm_file *file);

int xe_exec_queue_get_property_ioctl(struct drm_device *dev, void *data,

				     struct drm_file *file);

enum xe_exec_queue_priority xe_exec_queue_device_get_max_priority(struct xe_device *xe);

include/uapi/drm/xe_drm.h

+13 −35
Original line number Diff line number Diff line
@@ -105,10 +105,9 @@ struct xe_user_extension { 
#define DRM_XE_VM_BIND			0x05

#define DRM_XE_EXEC_QUEUE_CREATE	0x06

#define DRM_XE_EXEC_QUEUE_DESTROY	0x07

#define DRM_XE_EXEC_QUEUE_SET_PROPERTY	0x08

#define DRM_XE_EXEC_QUEUE_GET_PROPERTY	0x09

#define DRM_XE_EXEC			0x0a

#define DRM_XE_WAIT_USER_FENCE		0x0b

#define DRM_XE_EXEC_QUEUE_GET_PROPERTY	0x08

#define DRM_XE_EXEC			0x09

#define DRM_XE_WAIT_USER_FENCE		0x0a

/* Must be kept compact -- no holes */



#define DRM_IOCTL_XE_DEVICE_QUERY		DRM_IOWR(DRM_COMMAND_BASE + DRM_XE_DEVICE_QUERY, struct drm_xe_device_query)
@@ -867,18 +866,8 @@ struct drm_xe_vm_bind { 
/* Monitor 64MB contiguous region with 2M sub-granularity */

#define DRM_XE_ACC_GRANULARITY_64M 3



/**

 * struct drm_xe_exec_queue_set_property - exec queue set property

 *

 * Same namespace for extensions as drm_xe_exec_queue_create

 */

struct drm_xe_exec_queue_set_property {

	/** @extensions: Pointer to the first extension struct, if any */

	__u64 extensions;



	/** @exec_queue_id: Exec queue ID */

	__u32 exec_queue_id;



struct drm_xe_exec_queue_create {

#define DRM_XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY		0

#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_PRIORITY		0

#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_TIMESLICE		1

#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_PREEMPTION_TIMEOUT	2
@@ -887,18 +876,7 @@ struct drm_xe_exec_queue_set_property { 
#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_TRIGGER		5

#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_NOTIFY		6

#define   DRM_XE_EXEC_QUEUE_SET_PROPERTY_ACC_GRANULARITY	7

	/** @property: property to set */

	__u32 property;



	/** @value: property value */

	__u64 value;



	/** @reserved: Reserved */

	__u64 reserved[2];

};



struct drm_xe_exec_queue_create {

#define DRM_XE_EXEC_QUEUE_EXTENSION_SET_PROPERTY               0

	/** @extensions: Pointer to the first extension struct, if any */

	__u64 extensions;