Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Mikko Rapeli <mikko.rapeli@iki.fi>

authored by

Mikko Rapeli and committed by
Gabriel Laskar
31b4dfe2 8860487e

+64 -64
+64 -64
include/uapi/drm/radeon_drm.h
··· 793 793 #define RADEON_GEM_DOMAIN_VRAM 0x4 794 794 795 795 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; 799 799 }; 800 800 801 801 #define RADEON_GEM_NO_BACKING_STORE (1 << 0) ··· 807 807 #define RADEON_GEM_NO_CPU_ACCESS (1 << 4) 808 808 809 809 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; 815 815 }; 816 816 817 817 /* ··· 825 825 #define RADEON_GEM_USERPTR_REGISTER (1 << 3) 826 826 827 827 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; 832 832 }; 833 833 834 834 #define RADEON_TILING_MACRO 0x1 ··· 850 850 #define RADEON_TILING_EG_STENCIL_TILE_SPLIT_MASK 0xf 851 851 852 852 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; 856 856 }; 857 857 858 858 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; 862 862 }; 863 863 864 864 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; 870 870 }; 871 871 872 872 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; 876 876 }; 877 877 878 878 struct drm_radeon_gem_wait_idle { 879 - uint32_t handle; 880 - uint32_t pad; 879 + __u32 handle; 880 + __u32 pad; 881 881 }; 882 882 883 883 struct drm_radeon_gem_busy { 884 - uint32_t handle; 885 - uint32_t domain; 884 + __u32 handle; 885 + __u32 domain; 886 886 }; 887 887 888 888 struct drm_radeon_gem_pread { 889 889 /** Handle for the object being read. */ 890 - uint32_t handle; 891 - uint32_t pad; 890 + __u32 handle; 891 + __u32 pad; 892 892 /** Offset into the object to read from */ 893 - uint64_t offset; 893 + __u64 offset; 894 894 /** Length of data to read */ 895 - uint64_t size; 895 + __u64 size; 896 896 /** Pointer to write the data into. */ 897 897 /* void *, but pointers are not 32/64 compatible */ 898 - uint64_t data_ptr; 898 + __u64 data_ptr; 899 899 }; 900 900 901 901 struct drm_radeon_gem_pwrite { 902 902 /** Handle for the object being written to. */ 903 - uint32_t handle; 904 - uint32_t pad; 903 + __u32 handle; 904 + __u32 pad; 905 905 /** Offset into the object to write to */ 906 - uint64_t offset; 906 + __u64 offset; 907 907 /** Length of data to write */ 908 - uint64_t size; 908 + __u64 size; 909 909 /** Pointer to read the data from. */ 910 910 /* void *, but pointers are not 32/64 compatible */ 911 - uint64_t data_ptr; 911 + __u64 data_ptr; 912 912 }; 913 913 914 914 /* Sets or returns a value associated with a buffer. */ 915 915 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 */ 919 919 }; 920 920 921 921 #define RADEON_GEM_OP_GET_INITIAL_DOMAIN 0 ··· 935 935 #define RADEON_VM_PAGE_SNOOPED (1 << 4) 936 936 937 937 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; 943 943 }; 944 944 945 945 #define RADEON_CHUNK_ID_RELOCS 0x01 ··· 961 961 /* 0 = normal, + = higher priority, - = lower priority */ 962 962 963 963 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; 967 967 }; 968 968 969 969 /* drm_radeon_cs_reloc.flags */ 970 970 #define RADEON_RELOC_PRIO_MASK (0xf << 0) 971 971 972 972 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; 977 977 }; 978 978 979 979 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; 984 984 /* 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; 987 987 }; 988 988 989 989 #define RADEON_INFO_DEVICE_ID 0x00 ··· 1042 1042 #define RADEON_INFO_GPU_RESET_COUNTER 0x26 1043 1043 1044 1044 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; 1048 1048 }; 1049 1049 1050 1050 /* Those correspond to the tile index to use, this is to explicitly state