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
793#define RADEON_GEM_DOMAIN_VRAM 0x4793#define RADEON_GEM_DOMAIN_VRAM 0x4
794 794
795struct drm_radeon_gem_info {795struct drm_radeon_gem_info {
796 uint64_t gart_size;796 __u64 gart_size;
797 uint64_t vram_size;797 __u64 vram_size;
798 uint64_t vram_visible;798 __u64 vram_visible;
799};799};
800 800
801#define RADEON_GEM_NO_BACKING_STORE (1 << 0)801#define RADEON_GEM_NO_BACKING_STORE (1 << 0)
@@ -807,11 +807,11 @@ struct drm_radeon_gem_info { · 5 unmodified lines
807#define RADEON_GEM_NO_CPU_ACCESS (1 << 4)807#define RADEON_GEM_NO_CPU_ACCESS (1 << 4)
808 808
809struct drm_radeon_gem_create {809struct drm_radeon_gem_create {
810 uint64_t size;810 __u64 size;
811 uint64_t alignment;811 __u64 alignment;
812 uint32_t handle;812 __u32 handle;
813 uint32_t initial_domain;813 __u32 initial_domain;
814 uint32_t flags;814 __u32 flags;
815};815};
816 816
817/*817/*
@@ -825,10 +825,10 @@ struct drm_radeon_gem_create { · 7 unmodified lines
825#define RADEON_GEM_USERPTR_REGISTER (1 << 3)825#define RADEON_GEM_USERPTR_REGISTER (1 << 3)
826 826
827struct drm_radeon_gem_userptr {827struct drm_radeon_gem_userptr {
828 uint64_t addr;828 __u64 addr;
829 uint64_t size;829 __u64 size;
830 uint32_t flags;830 __u32 flags;
831 uint32_t handle;831 __u32 handle;
832};832};
833 833
834#define RADEON_TILING_MACRO 0x1834#define RADEON_TILING_MACRO 0x1
@@ -850,72 +850,72 @@ struct drm_radeon_gem_userptr { · 15 unmodified lines
850#define RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK 0xf850#define RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK 0xf
851 851
852struct drm_radeon_gem_set_tiling {852struct drm_radeon_gem_set_tiling {
853 uint32_t handle;853 __u32 handle;
854 uint32_t tiling_flags;854 __u32 tiling_flags;
855 uint32_t pitch;855 __u32 pitch;
856};856};
857 857
858struct drm_radeon_gem_get_tiling {858struct drm_radeon_gem_get_tiling {
859 uint32_t handle;859 __u32 handle;
860 uint32_t tiling_flags;860 __u32 tiling_flags;
861 uint32_t pitch;861 __u32 pitch;
862};862};
863 863
864struct drm_radeon_gem_mmap {864struct drm_radeon_gem_mmap {
865 uint32_t handle;865 __u32 handle;
866 uint32_t pad;866 __u32 pad;
867 uint64_t offset;867 __u64 offset;
868 uint64_t size;868 __u64 size;
869 uint64_t addr_ptr;869 __u64 addr_ptr;
870};870};
871 871
872struct drm_radeon_gem_set_domain {872struct drm_radeon_gem_set_domain {
873 uint32_t handle;873 __u32 handle;
874 uint32_t read_domains;874 __u32 read_domains;
875 uint32_t write_domain;875 __u32 write_domain;
876};876};
877 877
878struct drm_radeon_gem_wait_idle {878struct drm_radeon_gem_wait_idle {
879 uint32_t handle;879 __u32 handle;
880 uint32_t pad;880 __u32 pad;
881};881};
882 882
883struct drm_radeon_gem_busy {883struct drm_radeon_gem_busy {
884 uint32_t handle;884 __u32 handle;
885 uint32_t domain;885 __u32 domain;
886};886};
887 887
888struct drm_radeon_gem_pread {888struct drm_radeon_gem_pread {
889 /** Handle for the object being read. */889 /** Handle for the object being read. */
890 uint32_t handle;890 __u32 handle;
891 uint32_t pad;891 __u32 pad;
892 /** Offset into the object to read from */892 /** Offset into the object to read from */
893 uint64_t offset;893 __u64 offset;
894 /** Length of data to read */894 /** Length of data to read */
895 uint64_t size;895 __u64 size;
896 /** Pointer to write the data into. */896 /** Pointer to write the data into. */
897 /* void *, but pointers are not 32/64 compatible */897 /* void *, but pointers are not 32/64 compatible */
898 uint64_t data_ptr;898 __u64 data_ptr;
899};899};
900 900
901struct drm_radeon_gem_pwrite {901struct drm_radeon_gem_pwrite {
902 /** Handle for the object being written to. */902 /** Handle for the object being written to. */
903 uint32_t handle;903 __u32 handle;
904 uint32_t pad;904 __u32 pad;
905 /** Offset into the object to write to */905 /** Offset into the object to write to */
906 uint64_t offset;906 __u64 offset;
907 /** Length of data to write */907 /** Length of data to write */
908 uint64_t size;908 __u64 size;
909 /** Pointer to read the data from. */909 /** Pointer to read the data from. */
910 /* void *, but pointers are not 32/64 compatible */910 /* void *, but pointers are not 32/64 compatible */
911 uint64_t data_ptr;911 __u64 data_ptr;
912};912};
913 913
914/* Sets or returns a value associated with a buffer. */914/* Sets or returns a value associated with a buffer. */
915struct drm_radeon_gem_op {915struct drm_radeon_gem_op {
916 uint32_t handle; /* buffer */916 __u32 handle; /* buffer */
917 uint32_t op; /* RADEON_GEM_OP_* */917 __u32 op; /* RADEON_GEM_OP_* */
918 uint64_t value; /* input or return value */918 __u64 value; /* input or return value */
919};919};
920 920
921#define RADEON_GEM_OP_GET_INITIAL_DOMAIN 0921#define RADEON_GEM_OP_GET_INITIAL_DOMAIN 0
@@ -935,11 +935,11 @@ struct drm_radeon_gem_op { · 13 unmodified lines
935#define RADEON_VM_PAGE_SNOOPED (1 << 4)935#define RADEON_VM_PAGE_SNOOPED (1 << 4)
936 936
937struct drm_radeon_gem_va {937struct drm_radeon_gem_va {
938 uint32_t handle;938 __u32 handle;
939 uint32_t operation;939 __u32 operation;
940 uint32_t vm_id;940 __u32 vm_id;
941 uint32_t flags;941 __u32 flags;
942 uint64_t offset;942 __u64 offset;
943};943};
944 944
945#define RADEON_CHUNK_ID_RELOCS 0x01945#define RADEON_CHUNK_ID_RELOCS 0x01
@@ -961,29 +961,29 @@ struct drm_radeon_gem_va { · 15 unmodified lines
961/* 0 = normal, + = higher priority, - = lower priority */961/* 0 = normal, + = higher priority, - = lower priority */
962 962
963struct drm_radeon_cs_chunk {963struct drm_radeon_cs_chunk {
964 uint32_t chunk_id;964 __u32 chunk_id;
965 uint32_t length_dw;965 __u32 length_dw;
966 uint64_t chunk_data;966 __u64 chunk_data;
967};967};
968 968
969/* drm_radeon_cs_reloc.flags */969/* drm_radeon_cs_reloc.flags */
970#define RADEON_RELOC_PRIO_MASK (0xf << 0)970#define RADEON_RELOC_PRIO_MASK (0xf << 0)
971 971
972struct drm_radeon_cs_reloc {972struct drm_radeon_cs_reloc {
973 uint32_t handle;973 __u32 handle;
974 uint32_t read_domains;974 __u32 read_domains;
975 uint32_t write_domain;975 __u32 write_domain;
976 uint32_t flags;976 __u32 flags;
977};977};
978 978
979struct drm_radeon_cs {979struct drm_radeon_cs {
980 uint32_t num_chunks;980 __u32 num_chunks;
981 uint32_t cs_id;981 __u32 cs_id;
982 /* this points to uint64_t * which point to cs chunks */982 /* this points to __u64 * which point to cs chunks */
983 uint64_t chunks;983 __u64 chunks;
984 /* updates to the limits after this CS ioctl */984 /* updates to the limits after this CS ioctl */
985 uint64_t gart_limit;985 __u64 gart_limit;
986 uint64_t vram_limit;986 __u64 vram_limit;
987};987};
988 988
989#define RADEON_INFO_DEVICE_ID 0x00989#define RADEON_INFO_DEVICE_ID 0x00
@@ -1042,9 +1042,9 @@ struct drm_radeon_cs { · 52 unmodified lines
1042#define RADEON_INFO_GPU_RESET_COUNTER 0x261042#define RADEON_INFO_GPU_RESET_COUNTER 0x26
1043 1043
1044struct drm_radeon_info {1044struct drm_radeon_info {
1045 uint32_t request;1045 __u32 request;
1046 uint32_t pad;1046 __u32 pad;
1047 uint64_t value;1047 __u64 value;
1048};1048};
1049 1049
1050/* Those correspond to the tile index to use, this is to explicitly state1050/* 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