History

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’

Mikko Rapeli committed 12 years ago

Commit 31b4dfe1 parent 88604871 file · +64 −64Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/drm/radeon_drm.h+64−64
@@ -793,9 +793,9 @@ typedef struct drm_radeon_surface_free { · 792 unmodified lines
793793 #define RADEON_GEM_DOMAIN_VRAM 0x4
794794
795795 struct drm_radeon_gem_info {
796− uint64_t gart_size;
797− uint64_t vram_size;
798− uint64_t vram_visible;
796+ __u64 gart_size;
797+ __u64 vram_size;
798+ __u64 vram_visible;
799799 };
800800
801801 #define RADEON_GEM_NO_BACKING_STORE (1 << 0)
@@ -807,11 +807,11 @@ struct drm_radeon_gem_info { · 5 unmodified lines
807807 #define RADEON_GEM_NO_CPU_ACCESS (1 << 4)
808808
809809 struct drm_radeon_gem_create {
810− uint64_t size;
811− uint64_t alignment;
812− uint32_t handle;
813− uint32_t initial_domain;
814− uint32_t flags;
810+ __u64 size;
811+ __u64 alignment;
812+ __u32 handle;
813+ __u32 initial_domain;
814+ __u32 flags;
815815 };
816816
817817 /*
@@ -825,10 +825,10 @@ struct drm_radeon_gem_create { · 7 unmodified lines
825825 #define RADEON_GEM_USERPTR_REGISTER (1 << 3)
826826
827827 struct drm_radeon_gem_userptr {
828− uint64_t addr;
829− uint64_t size;
830− uint32_t flags;
831− uint32_t handle;
828+ __u64 addr;
829+ __u64 size;
830+ __u32 flags;
831+ __u32 handle;
832832 };
833833
834834 #define RADEON_TILING_MACRO 0x1
@@ -850,72 +850,72 @@ struct drm_radeon_gem_userptr { · 15 unmodified lines
850850 #define RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK 0xf
851851
852852 struct drm_radeon_gem_set_tiling {
853− uint32_t handle;
854− uint32_t tiling_flags;
855− uint32_t pitch;
853+ __u32 handle;
854+ __u32 tiling_flags;
855+ __u32 pitch;
856856 };
857857
858858 struct drm_radeon_gem_get_tiling {
859− uint32_t handle;
860− uint32_t tiling_flags;
861− uint32_t pitch;
859+ __u32 handle;
860+ __u32 tiling_flags;
861+ __u32 pitch;
862862 };
863863
864864 struct drm_radeon_gem_mmap {
865− uint32_t handle;
866− uint32_t pad;
867− uint64_t offset;
868− uint64_t size;
869− uint64_t addr_ptr;
865+ __u32 handle;
866+ __u32 pad;
867+ __u64 offset;
868+ __u64 size;
869+ __u64 addr_ptr;
870870 };
871871
872872 struct drm_radeon_gem_set_domain {
873− uint32_t handle;
874− uint32_t read_domains;
875− uint32_t write_domain;
873+ __u32 handle;
874+ __u32 read_domains;
875+ __u32 write_domain;
876876 };
877877
878878 struct drm_radeon_gem_wait_idle {
879− uint32_t handle;
880− uint32_t pad;
879+ __u32 handle;
880+ __u32 pad;
881881 };
882882
883883 struct drm_radeon_gem_busy {
884− uint32_t handle;
885− uint32_t domain;
884+ __u32 handle;
885+ __u32 domain;
886886 };
887887
888888 struct drm_radeon_gem_pread {
889889 /** Handle for the object being read. */
890− uint32_t handle;
891− uint32_t pad;
890+ __u32 handle;
891+ __u32 pad;
892892 /** Offset into the object to read from */
893− uint64_t offset;
893+ __u64 offset;
894894 /** Length of data to read */
895− uint64_t size;
895+ __u64 size;
896896 /** Pointer to write the data into. */
897897 /* void *, but pointers are not 32/64 compatible */
898− uint64_t data_ptr;
898+ __u64 data_ptr;
899899 };
900900
901901 struct drm_radeon_gem_pwrite {
902902 /** Handle for the object being written to. */
903− uint32_t handle;
904− uint32_t pad;
903+ __u32 handle;
904+ __u32 pad;
905905 /** Offset into the object to write to */
906− uint64_t offset;
906+ __u64 offset;
907907 /** Length of data to write */
908− uint64_t size;
908+ __u64 size;
909909 /** Pointer to read the data from. */
910910 /* void *, but pointers are not 32/64 compatible */
911− uint64_t data_ptr;
911+ __u64 data_ptr;
912912 };
913913
914914 /* Sets or returns a value associated with a buffer. */
915915 struct drm_radeon_gem_op {
916− uint32_t handle; /* buffer */
917− uint32_t op; /* RADEON_GEM_OP_* */
918− uint64_t value; /* input or return value */
916+ __u32 handle; /* buffer */
917+ __u32 op; /* RADEON_GEM_OP_* */
918+ __u64 value; /* input or return value */
919919 };
920920
921921 #define RADEON_GEM_OP_GET_INITIAL_DOMAIN 0
@@ -935,11 +935,11 @@ struct drm_radeon_gem_op { · 13 unmodified lines
935935 #define RADEON_VM_PAGE_SNOOPED (1 << 4)
936936
937937 struct drm_radeon_gem_va {
938− uint32_t handle;
939− uint32_t operation;
940− uint32_t vm_id;
941− uint32_t flags;
942− uint64_t offset;
938+ __u32 handle;
939+ __u32 operation;
940+ __u32 vm_id;
941+ __u32 flags;
942+ __u64 offset;
943943 };
944944
945945 #define RADEON_CHUNK_ID_RELOCS 0x01
@@ -961,29 +961,29 @@ struct drm_radeon_gem_va { · 15 unmodified lines
961961 /* 0 = normal, + = higher priority, - = lower priority */
962962
963963 struct drm_radeon_cs_chunk {
964− uint32_t chunk_id;
965− uint32_t length_dw;
966− uint64_t chunk_data;
964+ __u32 chunk_id;
965+ __u32 length_dw;
966+ __u64 chunk_data;
967967 };
968968
969969 /* drm_radeon_cs_reloc.flags */
970970 #define RADEON_RELOC_PRIO_MASK (0xf << 0)
971971
972972 struct drm_radeon_cs_reloc {
973− uint32_t handle;
974− uint32_t read_domains;
975− uint32_t write_domain;
976− uint32_t flags;
973+ __u32 handle;
974+ __u32 read_domains;
975+ __u32 write_domain;
976+ __u32 flags;
977977 };
978978
979979 struct drm_radeon_cs {
980− uint32_t num_chunks;
981− uint32_t cs_id;
982− /* this points to uint64_t * which point to cs chunks */
983− uint64_t chunks;
980+ __u32 num_chunks;
981+ __u32 cs_id;
982+ /* this points to __u64 * which point to cs chunks */
983+ __u64 chunks;
984984 /* updates to the limits after this CS ioctl */
985− uint64_t gart_limit;
986− uint64_t vram_limit;
985+ __u64 gart_limit;
986+ __u64 vram_limit;
987987 };
988988
989989 #define RADEON_INFO_DEVICE_ID 0x00
@@ -1042,9 +1042,9 @@ struct drm_radeon_cs { · 52 unmodified lines
10421042 #define RADEON_INFO_GPU_RESET_COUNTER 0x26
10431043
10441044 struct drm_radeon_info {
1045− uint32_t request;
1046− uint32_t pad;
1047− uint64_t value;
1045+ __u32 request;
1046+ __u32 pad;
1047+ __u64 value;
10481048 };
10491049
10501050 /* Those correspond to the tile index to use, this is to explicitly state

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t