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

Commit 3080b838 authored by Rob Clark's avatar Rob Clark Committed by Greg Kroah-Hartman
Browse files

staging: drm/omap: initial dmabuf/prime import support 



This adds support to re-import omapdrm's own buffers.  Importing buffers
allocated by other drivers can be added later, but for now is not needed
(we don't yet have any other exportering drivers to test with).

Signed-off-by: default avatarRob Clark <rob@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b6b569e

drivers/staging/omapdrm/omap_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -767,7 +767,9 @@ static struct drm_driver omap_drm_driver = { 
		.debugfs_cleanup = omap_debugfs_cleanup,

#endif

		.prime_handle_to_fd = drm_gem_prime_handle_to_fd,

		.prime_fd_to_handle = drm_gem_prime_fd_to_handle,

		.gem_prime_export = omap_gem_prime_export,

		.gem_prime_import = omap_gem_prime_import,

		.gem_init_object = omap_gem_init_object,

		.gem_free_object = omap_gem_free_object,

		.gem_vm_ops = &omap_gem_vm_ops,

drivers/staging/omapdrm/omap_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ size_t omap_gem_mmap_size(struct drm_gem_object *obj); 


struct dma_buf * omap_gem_prime_export(struct drm_device *dev,

		struct drm_gem_object *obj, int flags);

struct drm_gem_object * omap_gem_prime_import(struct drm_device *dev,

		struct dma_buf *buffer);



static inline int align_pitch(int pitch, int width, int bpp)

{

drivers/staging/omapdrm/omap_gem_dmabuf.c

+22 −0
Original line number Diff line number Diff line
@@ -196,3 +196,25 @@ struct dma_buf * omap_gem_prime_export(struct drm_device *dev, 
{

	return dma_buf_export(obj, &omap_dmabuf_ops, obj->size, 0600);

}



struct drm_gem_object * omap_gem_prime_import(struct drm_device *dev,

		struct dma_buf *buffer)

{

	struct drm_gem_object *obj;



	/* is this one of own objects? */

	if (buffer->ops == &omap_dmabuf_ops) {

		obj = buffer->priv;

		/* is it from our device? */

		if (obj->dev == dev) {

			drm_gem_object_reference(obj);

			return obj;

		}

	}



	/*

	 * TODO add support for importing buffers from other devices..

	 * for now we don't need this but would be nice to add eventually

	 */

	return ERR_PTR(-EINVAL);

}