* [PATCH] uapi: fix drm/omap_drm.h userspace compilation errors
@ 2017-02-25 13:29 Dmitry V. Levin
2017-02-28 12:40 ` Tomi Valkeinen
0 siblings, 1 reply; 2+ messages in thread
From: Dmitry V. Levin @ 2017-02-25 13:29 UTC (permalink / raw)
To: David Airlie; +Cc: Laurent Pinchart, Tomi Valkeinen, dri-devel, linux-kernel
Consistently use types from linux/types.h like in other uapi drm/*_drm.h
header files to fix the following drm/omap_drm.h userspace compilation
errors:
/usr/include/drm/omap_drm.h:36:2: error: unknown type name 'uint64_t'
uint64_t param; /* in */
/usr/include/drm/omap_drm.h:37:2: error: unknown type name 'uint64_t'
uint64_t value; /* in (set_param), out (get_param) */
/usr/include/drm/omap_drm.h:56:2: error: unknown type name 'uint32_t'
uint32_t bytes; /* (for non-tiled formats) */
/usr/include/drm/omap_drm.h:58:3: error: unknown type name 'uint16_t'
uint16_t width;
/usr/include/drm/omap_drm.h:59:3: error: unknown type name 'uint16_t'
uint16_t height;
/usr/include/drm/omap_drm.h:65:2: error: unknown type name 'uint32_t'
uint32_t flags; /* in */
/usr/include/drm/omap_drm.h:66:2: error: unknown type name 'uint32_t'
uint32_t handle; /* out */
/usr/include/drm/omap_drm.h:67:2: error: unknown type name 'uint32_t'
uint32_t __pad;
/usr/include/drm/omap_drm.h:77:2: error: unknown type name 'uint32_t'
uint32_t handle; /* buffer handle (in) */
/usr/include/drm/omap_drm.h:78:2: error: unknown type name 'uint32_t'
uint32_t op; /* mask of omap_gem_op (in) */
/usr/include/drm/omap_drm.h:82:2: error: unknown type name 'uint32_t'
uint32_t handle; /* buffer handle (in) */
/usr/include/drm/omap_drm.h:83:2: error: unknown type name 'uint32_t'
uint32_t op; /* mask of omap_gem_op (in) */
/usr/include/drm/omap_drm.h:88:2: error: unknown type name 'uint32_t'
uint32_t nregions;
/usr/include/drm/omap_drm.h:89:2: error: unknown type name 'uint32_t'
uint32_t __pad;
/usr/include/drm/omap_drm.h:93:2: error: unknown type name 'uint32_t'
uint32_t handle; /* buffer handle (in) */
/usr/include/drm/omap_drm.h:94:2: error: unknown type name 'uint32_t'
uint32_t pad;
/usr/include/drm/omap_drm.h:95:2: error: unknown type name 'uint64_t'
uint64_t offset; /* mmap offset (out) */
/usr/include/drm/omap_drm.h:102:2: error: unknown type name 'uint32_t'
uint32_t size; /* virtual size for mmap'ing (out) */
/usr/include/drm/omap_drm.h:103:2: error: unknown type name 'uint32_t'
uint32_t __pad;
Fixes: ef6503e89194 ("drm: Kbuild: add omap_drm.h to the installed headers")
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
include/uapi/drm/omap_drm.h | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/include/uapi/drm/omap_drm.h b/include/uapi/drm/omap_drm.h
index 407cb55..7fb9786 100644
--- a/include/uapi/drm/omap_drm.h
+++ b/include/uapi/drm/omap_drm.h
@@ -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
--
ldv
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] uapi: fix drm/omap_drm.h userspace compilation errors
2017-02-25 13:29 [PATCH] uapi: fix drm/omap_drm.h userspace compilation errors Dmitry V. Levin
@ 2017-02-28 12:40 ` Tomi Valkeinen
0 siblings, 0 replies; 2+ messages in thread
From: Tomi Valkeinen @ 2017-02-28 12:40 UTC (permalink / raw)
To: Dmitry V. Levin; +Cc: David Airlie, Laurent Pinchart, dri-devel, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 2635 bytes --]
Hi,
On 25/02/17 15:29, Dmitry V. Levin wrote:
> Consistently use types from linux/types.h like in other uapi drm/*_drm.h
> header files to fix the following drm/omap_drm.h userspace compilation
> errors:
>
> /usr/include/drm/omap_drm.h:36:2: error: unknown type name 'uint64_t'
> uint64_t param; /* in */
> /usr/include/drm/omap_drm.h:37:2: error: unknown type name 'uint64_t'
> uint64_t value; /* in (set_param), out (get_param) */
> /usr/include/drm/omap_drm.h:56:2: error: unknown type name 'uint32_t'
> uint32_t bytes; /* (for non-tiled formats) */
> /usr/include/drm/omap_drm.h:58:3: error: unknown type name 'uint16_t'
> uint16_t width;
> /usr/include/drm/omap_drm.h:59:3: error: unknown type name 'uint16_t'
> uint16_t height;
> /usr/include/drm/omap_drm.h:65:2: error: unknown type name 'uint32_t'
> uint32_t flags; /* in */
> /usr/include/drm/omap_drm.h:66:2: error: unknown type name 'uint32_t'
> uint32_t handle; /* out */
> /usr/include/drm/omap_drm.h:67:2: error: unknown type name 'uint32_t'
> uint32_t __pad;
> /usr/include/drm/omap_drm.h:77:2: error: unknown type name 'uint32_t'
> uint32_t handle; /* buffer handle (in) */
> /usr/include/drm/omap_drm.h:78:2: error: unknown type name 'uint32_t'
> uint32_t op; /* mask of omap_gem_op (in) */
> /usr/include/drm/omap_drm.h:82:2: error: unknown type name 'uint32_t'
> uint32_t handle; /* buffer handle (in) */
> /usr/include/drm/omap_drm.h:83:2: error: unknown type name 'uint32_t'
> uint32_t op; /* mask of omap_gem_op (in) */
> /usr/include/drm/omap_drm.h:88:2: error: unknown type name 'uint32_t'
> uint32_t nregions;
> /usr/include/drm/omap_drm.h:89:2: error: unknown type name 'uint32_t'
> uint32_t __pad;
> /usr/include/drm/omap_drm.h:93:2: error: unknown type name 'uint32_t'
> uint32_t handle; /* buffer handle (in) */
> /usr/include/drm/omap_drm.h:94:2: error: unknown type name 'uint32_t'
> uint32_t pad;
> /usr/include/drm/omap_drm.h:95:2: error: unknown type name 'uint64_t'
> uint64_t offset; /* mmap offset (out) */
> /usr/include/drm/omap_drm.h:102:2: error: unknown type name 'uint32_t'
> uint32_t size; /* virtual size for mmap'ing (out) */
> /usr/include/drm/omap_drm.h:103:2: error: unknown type name 'uint32_t'
> uint32_t __pad;
>
> Fixes: ef6503e89194 ("drm: Kbuild: add omap_drm.h to the installed headers")
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> ---
> include/uapi/drm/omap_drm.h | 38 +++++++++++++++++++-------------------
> 1 file changed, 19 insertions(+), 19 deletions(-)
Thanks! I'll queue to fixes.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-28 14:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-25 13:29 [PATCH] uapi: fix drm/omap_drm.h userspace compilation errors Dmitry V. Levin
2017-02-28 12:40 ` Tomi Valkeinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).