Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1705300

Re: [PATCH v06 32/36] uapi drm/armada_drm.h: use __u32 and __u64 instead of uint32_t and uint64_t

Show all headers | View raw

On Sun, Aug 06, 2017 at 06:44:23PM +0200, Mikko Rapeli wrote:
> These are defined in linux/types.h or drm/drm.h. Fixes
> user space compilation errors like:
> 
> drm/armada_drm.h:26:2: error: unknown type name ‘uint32_t’
>   uint32_t handle;
>   ^~~~~~~~
> 
> Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
> Cc: Emil Velikov <emil.l.velikov@gmail.com>
> Cc: Gabriel Laskar <gabriel@lse.epita.fr>
> Cc: Russell King <rmk+kernel@arm.linux.org.uk>
> Cc: Rob Clark <robdclark@gmail.com>

Applied to drm-misc, thanks.
-Daniel

> ---
>  include/uapi/drm/armada_drm.h | 22 +++++++++++-----------
>  1 file changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/include/uapi/drm/armada_drm.h b/include/uapi/drm/armada_drm.h
> index 72e326f9c7de..0cb932416cfe 100644
> --- a/include/uapi/drm/armada_drm.h
> +++ b/include/uapi/drm/armada_drm.h
> @@ -23,27 +23,27 @@ extern "C" {
>  	DRM_##dir(DRM_COMMAND_BASE + DRM_ARMADA_##name, struct drm_armada_##str)
>  
>  struct drm_armada_gem_create {
> -	uint32_t handle;
> -	uint32_t size;
> +	__u32 handle;
> +	__u32 size;
>  };
>  #define DRM_IOCTL_ARMADA_GEM_CREATE \
>  	ARMADA_IOCTL(IOWR, GEM_CREATE, gem_create)
>  
>  struct drm_armada_gem_mmap {
> -	uint32_t handle;
> -	uint32_t pad;
> -	uint64_t offset;
> -	uint64_t size;
> -	uint64_t addr;
> +	__u32 handle;
> +	__u32 pad;
> +	__u64 offset;
> +	__u64 size;
> +	__u64 addr;
>  };
>  #define DRM_IOCTL_ARMADA_GEM_MMAP \
>  	ARMADA_IOCTL(IOWR, GEM_MMAP, gem_mmap)
>  
>  struct drm_armada_gem_pwrite {
> -	uint64_t ptr;
> -	uint32_t handle;
> -	uint32_t offset;
> -	uint32_t size;
> +	__u64 ptr;
> +	__u32 handle;
> +	__u32 offset;
> +	__u32 size;
>  };
>  #define DRM_IOCTL_ARMADA_GEM_PWRITE \
>  	ARMADA_IOCTL(IOW, GEM_PWRITE, gem_pwrite)
> -- 
> 2.13.3
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v06 32/36] uapi drm/armada_drm.h: use __u32 and __u64 instead of uint32_t and uint64_t Mikko Rapeli <mikko.rapeli@iki.fi> - 2017-08-06 19:10 +0200
  Re: [PATCH v06 32/36] uapi drm/armada_drm.h: use __u32 and __u64  instead of uint32_t and uint64_t Daniel Vetter <daniel@ffwll.ch> - 2017-08-07 11:50 +0200

csiph-web