Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84624813 authored by Ben Widawsky's avatar Ben Widawsky Committed by Daniel Vetter
Browse files

drm/i915/context: create & destroy ioctls 



Add the interfaces to allow user space to create and destroy contexts.
Contexts are destroyed automatically if the file descriptor for the dri
device is closed.

Following convention as usual here causes checkpatch warnings.

v2: with is_initialized, no longer need to init at create
drop the context switch on create (daniel)

v3: Use interruptible lock (Chris)
return -ENODEV in !GEM case (Chris)

Signed-off-by: default avatarBen Widawsky <ben@bwidawsk.net>
parent f2ef6eb1

drivers/gpu/drm/i915/i915_dma.c

+2 −0
Original line number Diff line number Diff line
@@ -1848,6 +1848,8 @@ struct drm_ioctl_desc i915_ioctls[] = { 
	DRM_IOCTL_DEF_DRV(I915_SET_SPRITE_COLORKEY, intel_sprite_set_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GET_SPRITE_COLORKEY, intel_sprite_get_colorkey, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GEM_WAIT, i915_gem_wait_ioctl, DRM_AUTH|DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_CREATE, i915_gem_context_create_ioctl, DRM_UNLOCKED),

	DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_DESTROY, i915_gem_context_destroy_ioctl, DRM_UNLOCKED),

};



int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls);

drivers/gpu/drm/i915/i915_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -1386,6 +1386,10 @@ void i915_gem_context_open(struct drm_device *dev, struct drm_file *file); 
void i915_gem_context_close(struct drm_device *dev, struct drm_file *file);

int i915_switch_context(struct intel_ring_buffer *ring,

			struct drm_file *file, int to_id);

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

				  struct drm_file *file);

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

				   struct drm_file *file);



/* i915_gem_gtt.c */

int __must_check i915_gem_init_aliasing_ppgtt(struct drm_device *dev);

drivers/gpu/drm/i915/i915_gem_context.c

+55 −0
Original line number Diff line number Diff line
@@ -489,3 +489,58 @@ int i915_switch_context(struct intel_ring_buffer *ring, 
		drm_gem_object_unreference(&from_obj->base);

	return ret;

}



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

				  struct drm_file *file)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_gem_context_create *args = data;

	struct drm_i915_file_private *file_priv = file->driver_priv;

	struct i915_hw_context *ctx;

	int ret;



	if (!(dev->driver->driver_features & DRIVER_GEM))

		return -ENODEV;



	ret = i915_mutex_lock_interruptible(dev);

	if (ret)

		return ret;



	ret = create_hw_context(dev, file_priv, &ctx);

	mutex_unlock(&dev->struct_mutex);



	args->ctx_id = ctx->id;

	DRM_DEBUG_DRIVER("HW context %d created\n", args->ctx_id);



	return ret;

}



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

				   struct drm_file *file)

{

	struct drm_i915_gem_context_destroy *args = data;

	struct drm_i915_file_private *file_priv = file->driver_priv;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct i915_hw_context *ctx;

	int ret;



	if (!(dev->driver->driver_features & DRIVER_GEM))

		return -ENODEV;



	ret = i915_mutex_lock_interruptible(dev);

	if (ret)

		return ret;



	ctx = i915_gem_context_get(file_priv, args->ctx_id);

	if (!ctx) {

		mutex_unlock(&dev->struct_mutex);

		return -EINVAL;

	}



	do_destroy(ctx);



	mutex_unlock(&dev->struct_mutex);



	DRM_DEBUG_DRIVER("HW context %d destroyed\n", args->ctx_id);

	return 0;

}

include/drm/i915_drm.h

+15 −0
Original line number Diff line number Diff line
@@ -201,6 +201,8 @@ typedef struct _drm_i915_sarea { 
#define DRM_I915_GET_SPRITE_COLORKEY	0x2a

#define DRM_I915_SET_SPRITE_COLORKEY	0x2b

#define DRM_I915_GEM_WAIT	0x2c

#define DRM_I915_GEM_CONTEXT_CREATE	0x2d

#define DRM_I915_GEM_CONTEXT_DESTROY	0x2e



#define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)

#define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
@@ -245,6 +247,8 @@ typedef struct _drm_i915_sarea { 
#define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)

#define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey)

#define DRM_IOCTL_I915_GEM_WAIT		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait)

#define DRM_IOCTL_I915_GEM_CONTEXT_CREATE	DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_CREATE, struct drm_i915_gem_context_create)

#define DRM_IOCTL_I915_GEM_CONTEXT_DESTROY	DRM_IOW (DRM_COMMAND_BASE + DRM_I915_GEM_CONTEXT_DESTROY, struct drm_i915_gem_context_destroy)



/* Allow drivers to submit batchbuffers directly to hardware, relying

 * on the security mechanisms provided by hardware.
@@ -897,4 +901,15 @@ struct drm_i915_gem_wait { 
	__s64 timeout_ns;

};



struct drm_i915_gem_context_create {

	/*  output: id of new context*/

	__u32 ctx_id;

	__u32 pad;

};



struct drm_i915_gem_context_destroy {

	__u32 ctx_id;

	__u32 pad;

};



#endif				/* _I915_DRM_H_ */