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

Commit 6ed51175 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'omapdrm-4.11-fixes' of... 

Merge tag 'omapdrm-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-fixes

omapdrm fixes for v4.11

- Fix types in omapdrm uapi header to avoid userspace compilation errors
- Fix dmabuf mmap for dma_alloc'ed buffers

* tag 'omapdrm-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  uapi: fix drm/omap_drm.h userspace compilation errors
  drm/omap: fix dmabuf mmap for dma_alloc'ed buffers
parents e7bb4056 337ba7fb

drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c

+0 −3
Original line number Diff line number Diff line
@@ -147,9 +147,6 @@ static int omap_gem_dmabuf_mmap(struct dma_buf *buffer, 
	struct drm_gem_object *obj = buffer->priv;

	int ret = 0;



	if (WARN_ON(!obj->filp))

		return -EINVAL;



	ret = drm_gem_mmap_obj(obj, omap_gem_mmap_size(obj), vma);

	if (ret < 0)

		return ret;

include/uapi/drm/omap_drm.h

+19 −19
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ extern "C" { 
#define OMAP_PARAM_CHIPSET_ID	1	/* ie. 0x3430, 0x4430, etc */



struct drm_omap_param {

	uint64_t param;			/* in */

	uint64_t value;			/* in (set_param), out (get_param) */

	__u64 param;			/* in */

	__u64 value;			/* in (set_param), out (get_param) */

};



#define OMAP_BO_SCANOUT		0x00000001	/* scanout capable (phys contiguous) */
@@ -53,18 +53,18 @@ struct drm_omap_param { 
#define OMAP_BO_TILED		(OMAP_BO_TILED_8 | OMAP_BO_TILED_16 | OMAP_BO_TILED_32)



union omap_gem_size {

	uint32_t bytes;		/* (for non-tiled formats) */

	__u32 bytes;		/* (for non-tiled formats) */

	struct {

		uint16_t width;

		uint16_t height;

		__u16 width;

		__u16 height;

	} tiled;		/* (for tiled formats) */

};



struct drm_omap_gem_new {

	union omap_gem_size size;	/* in */

	uint32_t flags;			/* in */

	uint32_t handle;		/* out */

	uint32_t __pad;

	__u32 flags;			/* in */

	__u32 handle;			/* out */

	__u32 __pad;

};



/* mask of operations: */
@@ -74,33 +74,33 @@ enum omap_gem_op { 
};



struct drm_omap_gem_cpu_prep {

	uint32_t handle;		/* buffer handle (in) */

	uint32_t op;			/* mask of omap_gem_op (in) */

	__u32 handle;			/* buffer handle (in) */

	__u32 op;			/* mask of omap_gem_op (in) */

};



struct drm_omap_gem_cpu_fini {

	uint32_t handle;		/* buffer handle (in) */

	uint32_t op;			/* mask of omap_gem_op (in) */

	__u32 handle;			/* buffer handle (in) */

	__u32 op;			/* mask of omap_gem_op (in) */

	/* TODO maybe here we pass down info about what regions are touched

	 * by sw so we can be clever about cache ops?  For now a placeholder,

	 * set to zero and we just do full buffer flush..

	 */

	uint32_t nregions;

	uint32_t __pad;

	__u32 nregions;

	__u32 __pad;

};



struct drm_omap_gem_info {

	uint32_t handle;		/* buffer handle (in) */

	uint32_t pad;

	uint64_t offset;		/* mmap offset (out) */

	__u32 handle;			/* buffer handle (in) */

	__u32 pad;

	__u64 offset;			/* mmap offset (out) */

	/* note: in case of tiled buffers, the user virtual size can be

	 * different from the physical size (ie. how many pages are needed

	 * to back the object) which is returned in DRM_IOCTL_GEM_OPEN..

	 * This size here is the one that should be used if you want to

	 * mmap() the buffer:

	 */

	uint32_t size;			/* virtual size for mmap'ing (out) */

	uint32_t __pad;

	__u32 size;			/* virtual size for mmap'ing (out) */

	__u32 __pad;

};



#define DRM_OMAP_GET_PARAM		0x00