Commit 31b4dfe2 authored by Mikko Rapeli's avatar Mikko Rapeli Committed by Gabriel Laskar
Browse files

radeon_drm.h: use __u32 and __u64 from linux/types.h 



Fixes userspace compiler error:

drm/radeon_drm.h:794:2: error: unknown type name ‘uint64_t’

Signed-off-by: default avatarMikko Rapeli <mikko.rapeli@iki.fi>
parent 8860487e

include/uapi/drm/radeon_drm.h

+64 −64
Original line number Diff line number Diff line
@@ -793,9 +793,9 @@ typedef struct drm_radeon_surface_free { 
#define RADEON_GEM_DOMAIN_VRAM		0x4



struct drm_radeon_gem_info {

	uint64_t	gart_size;

	uint64_t	vram_size;

	uint64_t	vram_visible;

	__u64	gart_size;

	__u64	vram_size;

	__u64	vram_visible;

};



#define RADEON_GEM_NO_BACKING_STORE	(1 << 0)
@@ -807,11 +807,11 @@ struct drm_radeon_gem_info { 
#define RADEON_GEM_NO_CPU_ACCESS	(1 << 4)



struct drm_radeon_gem_create {

	uint64_t	size;

	uint64_t	alignment;

	uint32_t	handle;

	uint32_t	initial_domain;

	uint32_t	flags;

	__u64	size;

	__u64	alignment;

	__u32	handle;

	__u32	initial_domain;

	__u32	flags;

};



/*
@@ -825,10 +825,10 @@ struct drm_radeon_gem_create { 
#define RADEON_GEM_USERPTR_REGISTER	(1 << 3)



struct drm_radeon_gem_userptr {

	uint64_t		addr;

	uint64_t		size;

	uint32_t		flags;

	uint32_t		handle;

	__u64		addr;

	__u64		size;

	__u32		flags;

	__u32		handle;

};



#define RADEON_TILING_MACRO				0x1
@@ -850,72 +850,72 @@ struct drm_radeon_gem_userptr { 
#define RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK	0xf



struct drm_radeon_gem_set_tiling {

	uint32_t	handle;

	uint32_t	tiling_flags;

	uint32_t	pitch;

	__u32	handle;

	__u32	tiling_flags;

	__u32	pitch;

};



struct drm_radeon_gem_get_tiling {

	uint32_t	handle;

	uint32_t	tiling_flags;

	uint32_t	pitch;

	__u32	handle;

	__u32	tiling_flags;

	__u32	pitch;

};



struct drm_radeon_gem_mmap {

	uint32_t	handle;

	uint32_t	pad;

	uint64_t	offset;

	uint64_t	size;

	uint64_t	addr_ptr;

	__u32	handle;

	__u32	pad;

	__u64	offset;

	__u64	size;

	__u64	addr_ptr;

};



struct drm_radeon_gem_set_domain {

	uint32_t	handle;

	uint32_t	read_domains;

	uint32_t	write_domain;

	__u32	handle;

	__u32	read_domains;

	__u32	write_domain;

};



struct drm_radeon_gem_wait_idle {

	uint32_t	handle;

	uint32_t	pad;

	__u32	handle;

	__u32	pad;

};



struct drm_radeon_gem_busy {

	uint32_t	handle;

	uint32_t        domain;

	__u32	handle;

	__u32        domain;

};



struct drm_radeon_gem_pread {

	/** Handle for the object being read. */

	uint32_t handle;

	uint32_t pad;

	__u32 handle;

	__u32 pad;

	/** Offset into the object to read from */

	uint64_t offset;

	__u64 offset;

	/** Length of data to read */

	uint64_t size;

	__u64 size;

	/** Pointer to write the data into. */

	/* void *, but pointers are not 32/64 compatible */

	uint64_t data_ptr;

	__u64 data_ptr;

};



struct drm_radeon_gem_pwrite {

	/** Handle for the object being written to. */

	uint32_t handle;

	uint32_t pad;

	__u32 handle;

	__u32 pad;

	/** Offset into the object to write to */

	uint64_t offset;

	__u64 offset;

	/** Length of data to write */

	uint64_t size;

	__u64 size;

	/** Pointer to read the data from. */

	/* void *, but pointers are not 32/64 compatible */

	uint64_t data_ptr;

	__u64 data_ptr;

};



/* Sets or returns a value associated with a buffer. */

struct drm_radeon_gem_op {

	uint32_t	handle; /* buffer */

	uint32_t	op;     /* RADEON_GEM_OP_* */

	uint64_t	value;  /* input or return value */

	__u32	handle; /* buffer */

	__u32	op;     /* RADEON_GEM_OP_* */

	__u64	value;  /* input or return value */

};



#define RADEON_GEM_OP_GET_INITIAL_DOMAIN	0
@@ -935,11 +935,11 @@ struct drm_radeon_gem_op { 
#define RADEON_VM_PAGE_SNOOPED		(1 << 4)



struct drm_radeon_gem_va {

	uint32_t		handle;

	uint32_t		operation;

	uint32_t		vm_id;

	uint32_t		flags;

	uint64_t		offset;

	__u32		handle;

	__u32		operation;

	__u32		vm_id;

	__u32		flags;

	__u64		offset;

};



#define RADEON_CHUNK_ID_RELOCS	0x01
@@ -961,29 +961,29 @@ struct drm_radeon_gem_va { 
/* 0 = normal, + = higher priority, - = lower priority */



struct drm_radeon_cs_chunk {

	uint32_t		chunk_id;

	uint32_t		length_dw;

	uint64_t		chunk_data;

	__u32		chunk_id;

	__u32		length_dw;

	__u64		chunk_data;

};



/* drm_radeon_cs_reloc.flags */

#define RADEON_RELOC_PRIO_MASK		(0xf << 0)



struct drm_radeon_cs_reloc {

	uint32_t		handle;

	uint32_t		read_domains;

	uint32_t		write_domain;

	uint32_t		flags;

	__u32		handle;

	__u32		read_domains;

	__u32		write_domain;

	__u32		flags;

};



struct drm_radeon_cs {

	uint32_t		num_chunks;

	uint32_t		cs_id;

	/* this points to uint64_t * which point to cs chunks */

	uint64_t		chunks;

	__u32		num_chunks;

	__u32		cs_id;

	/* this points to __u64 * which point to cs chunks */

	__u64		chunks;

	/* updates to the limits after this CS ioctl */

	uint64_t		gart_limit;

	uint64_t		vram_limit;

	__u64		gart_limit;

	__u64		vram_limit;

};



#define RADEON_INFO_DEVICE_ID		0x00
@@ -1042,9 +1042,9 @@ struct drm_radeon_cs { 
#define RADEON_INFO_GPU_RESET_COUNTER	0x26



struct drm_radeon_info {

	uint32_t		request;

	uint32_t		pad;

	uint64_t		value;

	__u32		request;

	__u32		pad;

	__u64		value;

};



/* Those correspond to the tile index to use, this is to explicitly state