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

Commit ff72145b authored by Dave Airlie's avatar Dave Airlie
Browse files

drm: dumb scanout create/mmap for intel/radeon (v3) 



This is just an idea that might or might not be a good idea,
it basically adds two ioctls to create a dumb and map a dumb buffer
suitable for scanout. The handle can be passed to the KMS ioctls to create
a framebuffer.

It looks to me like it would be useful in the following cases:
a) in development drivers - we can always provide a shadowfb fallback.
b) libkms users - we can clean up libkms a lot and avoid linking
to libdrm_*.
c) plymouth via libkms is a lot easier.

Userspace bits would be just calls + mmaps. We could probably
mark these handles somehow as not being suitable for acceleartion
so as top stop people who are dumber than dumb.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 1f692a14

drivers/gpu/drm/drm_crtc.c

+33 −0
Original line number Diff line number Diff line
@@ -2694,3 +2694,36 @@ void drm_mode_config_reset(struct drm_device *dev) 
			connector->funcs->reset(connector);

}

EXPORT_SYMBOL(drm_mode_config_reset);



int drm_mode_create_dumb_ioctl(struct drm_device *dev,

			       void *data, struct drm_file *file_priv)

{

	struct drm_mode_create_dumb *args = data;



	if (!dev->driver->dumb_create)

		return -ENOSYS;

	return dev->driver->dumb_create(file_priv, dev, args);

}



int drm_mode_mmap_dumb_ioctl(struct drm_device *dev,

			     void *data, struct drm_file *file_priv)

{

	struct drm_mode_map_dumb *args = data;



	/* call driver ioctl to get mmap offset */

	if (!dev->driver->dumb_map_offset)

		return -ENOSYS;



	return dev->driver->dumb_map_offset(file_priv, dev, args->handle, &args->offset);

}



int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,

				void *data, struct drm_file *file_priv)

{

	struct drm_mode_destroy_dumb *args = data;



	if (!dev->driver->dumb_destroy)

		return -ENOSYS;



	return dev->driver->dumb_destroy(file_priv, dev, args->handle);

}

drivers/gpu/drm/drm_drv.c

+4 −1
Original line number Diff line number Diff line
@@ -150,7 +150,10 @@ static struct drm_ioctl_desc drm_ioctls[] = { 
	DRM_IOCTL_DEF(DRM_IOCTL_MODE_ADDFB, drm_mode_addfb, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_RMFB, drm_mode_rmfb, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_PAGE_FLIP, drm_mode_page_flip_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED)

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DIRTYFB, drm_mode_dirtyfb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_CREATE_DUMB, drm_mode_create_dumb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_MAP_DUMB, drm_mode_mmap_dumb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED),

	DRM_IOCTL_DEF(DRM_IOCTL_MODE_DESTROY_DUMB, drm_mode_destroy_dumb_ioctl, DRM_MASTER|DRM_CONTROL_ALLOW|DRM_UNLOCKED)

};



#define DRM_CORE_IOCTL_COUNT	ARRAY_SIZE( drm_ioctls )

drivers/gpu/drm/drm_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ EXPORT_SYMBOL(drm_gem_object_alloc); 
/**

 * Removes the mapping from handle to filp for this object.

 */

static int

int

drm_gem_handle_delete(struct drm_file *filp, u32 handle)

{

	struct drm_device *dev;
@@ -214,6 +214,7 @@ drm_gem_handle_delete(struct drm_file *filp, u32 handle) 


	return 0;

}

EXPORT_SYMBOL(drm_gem_handle_delete);



/**

 * Create a handle for this object. This adds a handle reference

drivers/gpu/drm/i915/i915_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -700,6 +700,9 @@ static struct drm_driver driver = { 
	.gem_init_object = i915_gem_init_object,

	.gem_free_object = i915_gem_free_object,

	.gem_vm_ops = &i915_gem_vm_ops,

	.dumb_create = i915_gem_dumb_create,

	.dumb_map_offset = i915_gem_mmap_gtt,

	.dumb_destroy = i915_gem_dumb_destroy,

	.ioctls = i915_ioctls,

	.fops = {

		 .owner = THIS_MODULE,

drivers/gpu/drm/i915/i915_drv.h

+7 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,13 @@ void i915_gem_object_move_to_active(struct drm_i915_gem_object *obj, 
				    struct intel_ring_buffer *ring,

				    u32 seqno);



int i915_gem_dumb_create(struct drm_file *file_priv,

			 struct drm_device *dev,

			 struct drm_mode_create_dumb *args);

int i915_gem_mmap_gtt(struct drm_file *file_priv, struct drm_device *dev,

		      uint32_t handle, uint64_t *offset);

int i915_gem_dumb_destroy(struct drm_file *file_priv, struct drm_device *dev,

			  uint32_t handle);			  

/**

 * Returns true if seq1 is later than seq2.

 */