Public headers should use types from include/uapi/linux/types.h.
This series fixes that, and allow out-of-the-box compilation of thoses headers from userspace.
Some programs need to parse and use these headers, in order to gather informations about the public kernel API, for example strace generation scripts, some abi checkers, and so on.
Gabriel Laskar (9): include/uapi/drm/armada_drm.h: use __u{32,64} types instead of uint{32,64}_t include/uapi/drm/virtgpu_drm.h: use __u{32,64} types instead of uint{32,64}_t include/uapi/drm/qxl_drm.h: use __u{32,64} types instead of uint{32,64}_t include/uapi/drm/nouveau_drm.h: use __u{32,64} types instead of uint{32,64}_t include/uapi/drm/amdgpu_drm.h: use __u{32,64} types instead of uint{32,64}_t include/uapi/drm/armada_drm.h: use __u{32,64} types instead of uint{32,64}_t include/uapi/drm/drm_mode.h: use __u{32,64} types instead of uint{32,64}_t include/uapi/drm/vmwgfx_drm.h: use __u{32,64} types instead of uint{32,64}_t include/uapi/drm/omap_drm.h: use __u{32,64} types instead of uint{32,64}_t
include/uapi/drm/amdgpu_drm.h | 292 +++++++++++++++++++++-------------------- include/uapi/drm/armada_drm.h | 24 ++-- include/uapi/drm/drm_mode.h | 16 +-- include/uapi/drm/nouveau_drm.h | 84 ++++++------ include/uapi/drm/omap_drm.h | 39 +++--- include/uapi/drm/qxl_drm.h | 74 +++++------ include/uapi/drm/radeon_drm.h | 130 +++++++++--------- include/uapi/drm/virtgpu_drm.h | 99 +++++++------- include/uapi/drm/vmwgfx_drm.h | 264 ++++++++++++++++++------------------- 9 files changed, 515 insertions(+), 507 deletions(-)
Kernel headers should use linux/types.h
Signed-off-by: Gabriel Laskar gabriel@lse.epita.fr --- include/uapi/drm/armada_drm.h | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/include/uapi/drm/armada_drm.h b/include/uapi/drm/armada_drm.h index 8dec3fd..77184b7 100644 --- a/include/uapi/drm/armada_drm.h +++ b/include/uapi/drm/armada_drm.h @@ -9,6 +9,8 @@ #ifndef DRM_ARMADA_IOCTL_H #define DRM_ARMADA_IOCTL_H
+#include <linux/types.h> + #define DRM_ARMADA_GEM_CREATE 0x00 #define DRM_ARMADA_GEM_MMAP 0x02 #define DRM_ARMADA_GEM_PWRITE 0x03 @@ -17,27 +19,27 @@ 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)
Kernel headers should use linux/types.h
Signed-off-by: Gabriel Laskar gabriel@lse.epita.fr --- include/uapi/drm/virtgpu_drm.h | 99 +++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 49 deletions(-)
diff --git a/include/uapi/drm/virtgpu_drm.h b/include/uapi/drm/virtgpu_drm.h index fc9e2d6..60b11e7 100644 --- a/include/uapi/drm/virtgpu_drm.h +++ b/include/uapi/drm/virtgpu_drm.h @@ -25,12 +25,13 @@ #define VIRTGPU_DRM_H
#include <stddef.h> +#include <linux/types.h> #include "drm/drm.h"
/* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. * - * Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel + * Do not use pointers, use __u64 instead for 32 bit / 64 bit user/kernel * compatibility Keep fields aligned to their size */
@@ -45,88 +46,88 @@ #define DRM_VIRTGPU_GET_CAPS 0x09
struct drm_virtgpu_map { - uint64_t offset; /* use for mmap system call */ - uint32_t handle; - uint32_t pad; + __u64 offset; /* use for mmap system call */ + __u32 handle; + __u32 pad; };
struct drm_virtgpu_execbuffer { - uint32_t flags; /* for future use */ - uint32_t size; - uint64_t command; /* void* */ - uint64_t bo_handles; - uint32_t num_bo_handles; - uint32_t pad; + __u32 flags; /* for future use */ + __u32 size; + __u64 command; /* void* */ + __u64 bo_handles; + __u32 num_bo_handles; + __u32 pad; };
#define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */
struct drm_virtgpu_getparam { - uint64_t param; - uint64_t value; + __u64 param; + __u64 value; };
/* NO_BO flags? NO resource flag? */ /* resource flag for y_0_top */ struct drm_virtgpu_resource_create { - uint32_t target; - uint32_t format; - uint32_t bind; - uint32_t width; - uint32_t height; - uint32_t depth; - uint32_t array_size; - uint32_t last_level; - uint32_t nr_samples; - uint32_t flags; - uint32_t bo_handle; /* if this is set - recreate a new resource attached to this bo ? */ - uint32_t res_handle; /* returned by kernel */ - uint32_t size; /* validate transfer in the host */ - uint32_t stride; /* validate transfer in the host */ + __u32 target; + __u32 format; + __u32 bind; + __u32 width; + __u32 height; + __u32 depth; + __u32 array_size; + __u32 last_level; + __u32 nr_samples; + __u32 flags; + __u32 bo_handle; /* if this is set - recreate a new resource attached to this bo ? */ + __u32 res_handle; /* returned by kernel */ + __u32 size; /* validate transfer in the host */ + __u32 stride; /* validate transfer in the host */ };
struct drm_virtgpu_resource_info { - uint32_t bo_handle; - uint32_t res_handle; - uint32_t size; - uint32_t stride; + __u32 bo_handle; + __u32 res_handle; + __u32 size; + __u32 stride; };
struct drm_virtgpu_3d_box { - uint32_t x; - uint32_t y; - uint32_t z; - uint32_t w; - uint32_t h; - uint32_t d; + __u32 x; + __u32 y; + __u32 z; + __u32 w; + __u32 h; + __u32 d; };
struct drm_virtgpu_3d_transfer_to_host { - uint32_t bo_handle; + __u32 bo_handle; struct drm_virtgpu_3d_box box; - uint32_t level; - uint32_t offset; + __u32 level; + __u32 offset; };
struct drm_virtgpu_3d_transfer_from_host { - uint32_t bo_handle; + __u32 bo_handle; struct drm_virtgpu_3d_box box; - uint32_t level; - uint32_t offset; + __u32 level; + __u32 offset; };
#define VIRTGPU_WAIT_NOWAIT 1 /* like it */ struct drm_virtgpu_3d_wait { - uint32_t handle; /* 0 is an invalid handle */ - uint32_t flags; + __u32 handle; /* 0 is an invalid handle */ + __u32 flags; };
struct drm_virtgpu_get_caps { - uint32_t cap_set_id; - uint32_t cap_set_ver; - uint64_t addr; - uint32_t size; - uint32_t pad; + __u32 cap_set_id; + __u32 cap_set_ver; + __u64 addr; + __u32 size; + __u32 pad; };
#define DRM_IOCTL_VIRTGPU_MAP \
Kernel headers should use linux/types.h
Signed-off-by: Gabriel Laskar gabriel@lse.epita.fr --- include/uapi/drm/qxl_drm.h | 74 +++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/include/uapi/drm/qxl_drm.h b/include/uapi/drm/qxl_drm.h index ebebd36..2aa6376 100644 --- a/include/uapi/drm/qxl_drm.h +++ b/include/uapi/drm/qxl_drm.h @@ -30,7 +30,7 @@ /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. * - * Do not use pointers, use uint64_t instead for 32 bit / 64 bit user/kernel + * Do not use pointers, use __u64 instead for 32 bit / 64 bit user/kernel * compatibility Keep fields aligned to their size */
@@ -48,14 +48,14 @@ #define DRM_QXL_ALLOC_SURF 0x06
struct drm_qxl_alloc { - uint32_t size; - uint32_t handle; /* 0 is an invalid handle */ + __u32 size; + __u32 handle; /* 0 is an invalid handle */ };
struct drm_qxl_map { - uint64_t offset; /* use for mmap system call */ - uint32_t handle; - uint32_t pad; + __u64 offset; /* use for mmap system call */ + __u32 handle; + __u32 pad; };
/* @@ -68,59 +68,59 @@ struct drm_qxl_map { #define QXL_RELOC_TYPE_SURF 2
struct drm_qxl_reloc { - uint64_t src_offset; /* offset into src_handle or src buffer */ - uint64_t dst_offset; /* offset in dest handle */ - uint32_t src_handle; /* dest handle to compute address from */ - uint32_t dst_handle; /* 0 if to command buffer */ - uint32_t reloc_type; - uint32_t pad; + __u64 src_offset; /* offset into src_handle or src buffer */ + __u64 dst_offset; /* offset in dest handle */ + __u32 src_handle; /* dest handle to compute address from */ + __u32 dst_handle; /* 0 if to command buffer */ + __u32 reloc_type; + __u32 pad; };
struct drm_qxl_command { - uint64_t __user command; /* void* */ - uint64_t __user relocs; /* struct drm_qxl_reloc* */ - uint32_t type; - uint32_t command_size; - uint32_t relocs_num; - uint32_t pad; + __u64 __user command; /* void* */ + __u64 __user relocs; /* struct drm_qxl_reloc* */ + __u32 type; + __u32 command_size; + __u32 relocs_num; + __u32 pad; };
/* XXX: call it drm_qxl_commands? */ struct drm_qxl_execbuffer { - uint32_t flags; /* for future use */ - uint32_t commands_num; - uint64_t __user commands; /* struct drm_qxl_command* */ + __u32 flags; /* for future use */ + __u32 commands_num; + __u64 __user commands; /* struct drm_qxl_command* */ };
struct drm_qxl_update_area { - uint32_t handle; - uint32_t top; - uint32_t left; - uint32_t bottom; - uint32_t right; - uint32_t pad; + __u32 handle; + __u32 top; + __u32 left; + __u32 bottom; + __u32 right; + __u32 pad; };
#define QXL_PARAM_NUM_SURFACES 1 /* rom->n_surfaces */ #define QXL_PARAM_MAX_RELOCS 2 struct drm_qxl_getparam { - uint64_t param; - uint64_t value; + __u64 param; + __u64 value; };
/* these are one bit values */ struct drm_qxl_clientcap { - uint32_t index; - uint32_t pad; + __u32 index; + __u32 pad; };
struct drm_qxl_alloc_surf { - uint32_t format; - uint32_t width; - uint32_t height; - int32_t stride; - uint32_t handle; - uint32_t pad; + __u32 format; + __u32 width; + __u32 height; + __s32 stride; + __u32 handle; + __u32 pad; };
#define DRM_IOCTL_QXL_ALLOC \
Kernel headers should use linux/types.h
Signed-off-by: Gabriel Laskar gabriel@lse.epita.fr --- include/uapi/drm/nouveau_drm.h | 84 +++++++++++++++++++++--------------------- 1 file changed, 42 insertions(+), 42 deletions(-)
diff --git a/include/uapi/drm/nouveau_drm.h b/include/uapi/drm/nouveau_drm.h index fd594cc..722b6a6 100644 --- a/include/uapi/drm/nouveau_drm.h +++ b/include/uapi/drm/nouveau_drm.h @@ -41,34 +41,34 @@ #define NOUVEAU_GEM_TILE_NONCONTIG 0x00000008
struct drm_nouveau_gem_info { - uint32_t handle; - uint32_t domain; - uint64_t size; - uint64_t offset; - uint64_t map_handle; - uint32_t tile_mode; - uint32_t tile_flags; + __u32 handle; + __u32 domain; + __u64 size; + __u64 offset; + __u64 map_handle; + __u32 tile_mode; + __u32 tile_flags; };
struct drm_nouveau_gem_new { struct drm_nouveau_gem_info info; - uint32_t channel_hint; - uint32_t align; + __u32 channel_hint; + __u32 align; };
#define NOUVEAU_GEM_MAX_BUFFERS 1024 struct drm_nouveau_gem_pushbuf_bo_presumed { - uint32_t valid; - uint32_t domain; - uint64_t offset; + __u32 valid; + __u32 domain; + __u64 offset; };
struct drm_nouveau_gem_pushbuf_bo { - uint64_t user_priv; - uint32_t handle; - uint32_t read_domains; - uint32_t write_domains; - uint32_t valid_domains; + __u64 user_priv; + __u32 handle; + __u32 read_domains; + __u32 write_domains; + __u32 valid_domains; struct drm_nouveau_gem_pushbuf_bo_presumed presumed; };
@@ -77,46 +77,46 @@ struct drm_nouveau_gem_pushbuf_bo { #define NOUVEAU_GEM_RELOC_OR (1 << 2) #define NOUVEAU_GEM_MAX_RELOCS 1024 struct drm_nouveau_gem_pushbuf_reloc { - uint32_t reloc_bo_index; - uint32_t reloc_bo_offset; - uint32_t bo_index; - uint32_t flags; - uint32_t data; - uint32_t vor; - uint32_t tor; + __u32 reloc_bo_index; + __u32 reloc_bo_offset; + __u32 bo_index; + __u32 flags; + __u32 data; + __u32 vor; + __u32 tor; };
#define NOUVEAU_GEM_MAX_PUSH 512 struct drm_nouveau_gem_pushbuf_push { - uint32_t bo_index; - uint32_t pad; - uint64_t offset; - uint64_t length; + __u32 bo_index; + __u32 pad; + __u64 offset; + __u64 length; };
struct drm_nouveau_gem_pushbuf { - uint32_t channel; - uint32_t nr_buffers; - uint64_t buffers; - uint32_t nr_relocs; - uint32_t nr_push; - uint64_t relocs; - uint64_t push; - uint32_t suffix0; - uint32_t suffix1; - uint64_t vram_available; - uint64_t gart_available; + __u32 channel; + __u32 nr_buffers; + __u64 buffers; + __u32 nr_relocs; + __u32 nr_push; + __u64 relocs; + __u64 push; + __u32 suffix0; + __u32 suffix1; + __u64 vram_available; + __u64 gart_available; };
#define NOUVEAU_GEM_CPU_PREP_NOWAIT 0x00000001 #define NOUVEAU_GEM_CPU_PREP_WRITE 0x00000004 struct drm_nouveau_gem_cpu_prep { - uint32_t handle; - uint32_t flags; + __u32 handle; + __u32 flags; };
struct drm_nouveau_gem_cpu_fini { - uint32_t handle; + __u32 handle; };
#define DRM_NOUVEAU_GETPARAM 0x00 /* deprecated */
Kernel headers should use linux/types.h
Signed-off-by: Gabriel Laskar gabriel@lse.epita.fr --- include/uapi/drm/amdgpu_drm.h | 292 +++++++++++++++++++++--------------------- 1 file changed, 147 insertions(+), 145 deletions(-)
diff --git a/include/uapi/drm/amdgpu_drm.h b/include/uapi/drm/amdgpu_drm.h index e52933a..7f169c3 100644 --- a/include/uapi/drm/amdgpu_drm.h +++ b/include/uapi/drm/amdgpu_drm.h @@ -34,6 +34,8 @@
#include "drm.h"
+#include <linux/types.h> + #define DRM_AMDGPU_GEM_CREATE 0x00 #define DRM_AMDGPU_GEM_MMAP 0x01 #define DRM_AMDGPU_CTX 0x02 @@ -76,19 +78,19 @@
struct drm_amdgpu_gem_create_in { /** the requested memory size */ - uint64_t bo_size; + __u64 bo_size; /** physical start_addr alignment in bytes for some HW requirements */ - uint64_t alignment; + __u64 alignment; /** the requested memory domains */ - uint64_t domains; + __u64 domains; /** allocation flags */ - uint64_t domain_flags; + __u64 domain_flags; };
struct drm_amdgpu_gem_create_out { /** returned GEM object handle */ - uint32_t handle; - uint32_t _pad; + __u32 handle; + __u32 _pad; };
union drm_amdgpu_gem_create { @@ -105,28 +107,28 @@ union drm_amdgpu_gem_create {
struct drm_amdgpu_bo_list_in { /** Type of operation */ - uint32_t operation; + __u32 operation; /** Handle of list or 0 if we want to create one */ - uint32_t list_handle; + __u32 list_handle; /** Number of BOs in list */ - uint32_t bo_number; + __u32 bo_number; /** Size of each element describing BO */ - uint32_t bo_info_size; + __u32 bo_info_size; /** Pointer to array describing BOs */ - uint64_t bo_info_ptr; + __u64 bo_info_ptr; };
struct drm_amdgpu_bo_list_entry { /** Handle of BO */ - uint32_t bo_handle; + __u32 bo_handle; /** New (if specified) BO priority to be used during migration */ - uint32_t bo_priority; + __u32 bo_priority; };
struct drm_amdgpu_bo_list_out { /** Handle of resource list */ - uint32_t list_handle; - uint32_t _pad; + __u32 list_handle; + __u32 _pad; };
union drm_amdgpu_bo_list { @@ -150,26 +152,26 @@ union drm_amdgpu_bo_list {
struct drm_amdgpu_ctx_in { /** AMDGPU_CTX_OP_* */ - uint32_t op; + __u32 op; /** For future use, no flags defined so far */ - uint32_t flags; - uint32_t ctx_id; - uint32_t _pad; + __u32 flags; + __u32 ctx_id; + __u32 _pad; };
union drm_amdgpu_ctx_out { struct { - uint32_t ctx_id; - uint32_t _pad; + __u32 ctx_id; + __u32 _pad; } alloc;
struct { /** For future use, no flags defined so far */ - uint64_t flags; + __u64 flags; /** Number of resets caused by this context so far. */ - uint32_t hangs; + __u32 hangs; /** Reset status since the last call of the ioctl. */ - uint32_t reset_status; + __u32 reset_status; } state; };
@@ -189,12 +191,12 @@ union drm_amdgpu_ctx { #define AMDGPU_GEM_USERPTR_REGISTER (1 << 3)
struct drm_amdgpu_gem_userptr { - uint64_t addr; - uint64_t size; + __u64 addr; + __u64 size; /* AMDGPU_GEM_USERPTR_* */ - uint32_t flags; + __u32 flags; /* Resulting GEM handle */ - uint32_t handle; + __u32 handle; };
/* same meaning as the GB_TILE_MODE and GL_MACRO_TILE_MODE fields */ @@ -226,28 +228,28 @@ struct drm_amdgpu_gem_userptr { /** The same structure is shared for input/output */ struct drm_amdgpu_gem_metadata { /** GEM Object handle */ - uint32_t handle; + __u32 handle; /** Do we want get or set metadata */ - uint32_t op; + __u32 op; struct { /** For future use, no flags defined so far */ - uint64_t flags; + __u64 flags; /** family specific tiling info */ - uint64_t tiling_info; - uint32_t data_size_bytes; - uint32_t data[64]; + __u64 tiling_info; + __u32 data_size_bytes; + __u32 data[64]; } data; };
struct drm_amdgpu_gem_mmap_in { /** the GEM object handle */ - uint32_t handle; - uint32_t _pad; + __u32 handle; + __u32 _pad; };
struct drm_amdgpu_gem_mmap_out { /** mmap offset from the vma offset manager */ - uint64_t addr_ptr; + __u64 addr_ptr; };
union drm_amdgpu_gem_mmap { @@ -257,18 +259,18 @@ union drm_amdgpu_gem_mmap {
struct drm_amdgpu_gem_wait_idle_in { /** GEM object handle */ - uint32_t handle; + __u32 handle; /** For future use, no flags defined so far */ - uint32_t flags; + __u32 flags; /** Absolute timeout to wait */ - uint64_t timeout; + __u64 timeout; };
struct drm_amdgpu_gem_wait_idle_out { /** BO status: 0 - BO is idle, 1 - BO is busy */ - uint32_t status; + __u32 status; /** Returned current memory domain */ - uint32_t domain; + __u32 domain; };
union drm_amdgpu_gem_wait_idle { @@ -278,18 +280,18 @@ union drm_amdgpu_gem_wait_idle {
struct drm_amdgpu_wait_cs_in { /** Command submission handle */ - uint64_t handle; + __u64 handle; /** Absolute timeout to wait */ - uint64_t timeout; - uint32_t ip_type; - uint32_t ip_instance; - uint32_t ring; - uint32_t ctx_id; + __u64 timeout; + __u32 ip_type; + __u32 ip_instance; + __u32 ring; + __u32 ctx_id; };
struct drm_amdgpu_wait_cs_out { /** CS status: 0 - CS completed, 1 - CS still busy */ - uint64_t status; + __u64 status; };
union drm_amdgpu_wait_cs { @@ -303,11 +305,11 @@ union drm_amdgpu_wait_cs { /* Sets or returns a value associated with a buffer. */ struct drm_amdgpu_gem_op { /** GEM object handle */ - uint32_t handle; + __u32 handle; /** AMDGPU_GEM_OP_* */ - uint32_t op; + __u32 op; /** Input or return value */ - uint64_t value; + __u64 value; };
#define AMDGPU_VA_OP_MAP 1 @@ -326,18 +328,18 @@ struct drm_amdgpu_gem_op {
struct drm_amdgpu_gem_va { /** GEM object handle */ - uint32_t handle; - uint32_t _pad; + __u32 handle; + __u32 _pad; /** AMDGPU_VA_OP_* */ - uint32_t operation; + __u32 operation; /** AMDGPU_VM_PAGE_* */ - uint32_t flags; + __u32 flags; /** va address to assign . Must be correctly aligned.*/ - uint64_t va_address; + __u64 va_address; /** Specify offset inside of BO to assign. Must be correctly aligned.*/ - uint64_t offset_in_bo; + __u64 offset_in_bo; /** Specify mapping size. Must be correctly aligned. */ - uint64_t map_size; + __u64 map_size; };
#define AMDGPU_HW_IP_GFX 0 @@ -354,24 +356,24 @@ struct drm_amdgpu_gem_va { #define AMDGPU_CHUNK_ID_DEPENDENCIES 0x03
struct drm_amdgpu_cs_chunk { - uint32_t chunk_id; - uint32_t length_dw; - uint64_t chunk_data; + __u32 chunk_id; + __u32 length_dw; + __u64 chunk_data; };
struct drm_amdgpu_cs_in { /** Rendering context id */ - uint32_t ctx_id; + __u32 ctx_id; /** Handle of resource list associated with CS */ - uint32_t bo_list_handle; - uint32_t num_chunks; - uint32_t _pad; - /** this points to uint64_t * which point to cs chunks */ - uint64_t chunks; + __u32 bo_list_handle; + __u32 num_chunks; + __u32 _pad; + /** this points to __u64 * which point to cs chunks */ + __u64 chunks; };
struct drm_amdgpu_cs_out { - uint64_t handle; + __u64 handle; };
union drm_amdgpu_cs { @@ -388,32 +390,32 @@ union drm_amdgpu_cs { #define AMDGPU_IB_FLAG_PREAMBLE (1<<1)
struct drm_amdgpu_cs_chunk_ib { - uint32_t _pad; + __u32 _pad; /** AMDGPU_IB_FLAG_* */ - uint32_t flags; + __u32 flags; /** Virtual address to begin IB execution */ - uint64_t va_start; + __u64 va_start; /** Size of submission */ - uint32_t ib_bytes; + __u32 ib_bytes; /** HW IP to submit to */ - uint32_t ip_type; + __u32 ip_type; /** HW IP index of the same type to submit to */ - uint32_t ip_instance; + __u32 ip_instance; /** Ring index to submit to */ - uint32_t ring; + __u32 ring; };
struct drm_amdgpu_cs_chunk_dep { - uint32_t ip_type; - uint32_t ip_instance; - uint32_t ring; - uint32_t ctx_id; - uint64_t handle; + __u32 ip_type; + __u32 ip_instance; + __u32 ring; + __u32 ctx_id; + __u64 handle; };
struct drm_amdgpu_cs_chunk_fence { - uint32_t handle; - uint32_t offset; + __u32 handle; + __u32 offset; };
struct drm_amdgpu_cs_chunk_data { @@ -486,83 +488,83 @@ struct drm_amdgpu_cs_chunk_data { /* Input structure for the INFO ioctl */ struct drm_amdgpu_info { /* Where the return value will be stored */ - uint64_t return_pointer; + __u64 return_pointer; /* The size of the return value. Just like "size" in "snprintf", * it limits how many bytes the kernel can write. */ - uint32_t return_size; + __u32 return_size; /* The query request id. */ - uint32_t query; + __u32 query;
union { struct { - uint32_t id; - uint32_t _pad; + __u32 id; + __u32 _pad; } mode_crtc;
struct { /** AMDGPU_HW_IP_* */ - uint32_t type; + __u32 type; /** * Index of the IP if there are more IPs of the same * type. Ignored by AMDGPU_INFO_HW_IP_COUNT. */ - uint32_t ip_instance; + __u32 ip_instance; } query_hw_ip;
struct { - uint32_t dword_offset; + __u32 dword_offset; /** number of registers to read */ - uint32_t count; - uint32_t instance; + __u32 count; + __u32 instance; /** For future use, no flags defined so far */ - uint32_t flags; + __u32 flags; } read_mmr_reg;
struct { /** AMDGPU_INFO_FW_* */ - uint32_t fw_type; + __u32 fw_type; /** * Index of the IP if there are more IPs of * the same type. */ - uint32_t ip_instance; + __u32 ip_instance; /** * Index of the engine. Whether this is used depends * on the firmware type. (e.g. MEC, SDMA) */ - uint32_t index; - uint32_t _pad; + __u32 index; + __u32 _pad; } query_fw; }; };
struct drm_amdgpu_info_gds { /** GDS GFX partition size */ - uint32_t gds_gfx_partition_size; + __u32 gds_gfx_partition_size; /** GDS compute partition size */ - uint32_t compute_partition_size; + __u32 compute_partition_size; /** total GDS memory size */ - uint32_t gds_total_size; + __u32 gds_total_size; /** GWS size per GFX partition */ - uint32_t gws_per_gfx_partition; + __u32 gws_per_gfx_partition; /** GSW size per compute partition */ - uint32_t gws_per_compute_partition; + __u32 gws_per_compute_partition; /** OA size per GFX partition */ - uint32_t oa_per_gfx_partition; + __u32 oa_per_gfx_partition; /** OA size per compute partition */ - uint32_t oa_per_compute_partition; - uint32_t _pad; + __u32 oa_per_compute_partition; + __u32 _pad; };
struct drm_amdgpu_info_vram_gtt { - uint64_t vram_size; - uint64_t vram_cpu_accessible_size; - uint64_t gtt_size; + __u64 vram_size; + __u64 vram_cpu_accessible_size; + __u64 gtt_size; };
struct drm_amdgpu_info_firmware { - uint32_t ver; - uint32_t feature; + __u32 ver; + __u32 feature; };
#define AMDGPU_VRAM_TYPE_UNKNOWN 0 @@ -576,61 +578,61 @@ struct drm_amdgpu_info_firmware {
struct drm_amdgpu_info_device { /** PCI Device ID */ - uint32_t device_id; + __u32 device_id; /** Internal chip revision: A0, A1, etc.) */ - uint32_t chip_rev; - uint32_t external_rev; + __u32 chip_rev; + __u32 external_rev; /** Revision id in PCI Config space */ - uint32_t pci_rev; - uint32_t family; - uint32_t num_shader_engines; - uint32_t num_shader_arrays_per_engine; + __u32 pci_rev; + __u32 family; + __u32 num_shader_engines; + __u32 num_shader_arrays_per_engine; /* in KHz */ - uint32_t gpu_counter_freq; - uint64_t max_engine_clock; - uint64_t max_memory_clock; + __u32 gpu_counter_freq; + __u64 max_engine_clock; + __u64 max_memory_clock; /* cu information */ - uint32_t cu_active_number; - uint32_t cu_ao_mask; - uint32_t cu_bitmap[4][4]; + __u32 cu_active_number; + __u32 cu_ao_mask; + __u32 cu_bitmap[4][4]; /** Render backend pipe mask. One render backend is CB+DB. */ - uint32_t enabled_rb_pipes_mask; - uint32_t num_rb_pipes; - uint32_t num_hw_gfx_contexts; - uint32_t _pad; - uint64_t ids_flags; + __u32 enabled_rb_pipes_mask; + __u32 num_rb_pipes; + __u32 num_hw_gfx_contexts; + __u32 _pad; + __u64 ids_flags; /** Starting virtual address for UMDs. */ - uint64_t virtual_address_offset; + __u64 virtual_address_offset; /** The maximum virtual address */ - uint64_t virtual_address_max; + __u64 virtual_address_max; /** Required alignment of virtual addresses. */ - uint32_t virtual_address_alignment; + __u32 virtual_address_alignment; /** Page table entry - fragment size */ - uint32_t pte_fragment_size; - uint32_t gart_page_size; + __u32 pte_fragment_size; + __u32 gart_page_size; /** constant engine ram size*/ - uint32_t ce_ram_size; + __u32 ce_ram_size; /** video memory type info*/ - uint32_t vram_type; + __u32 vram_type; /** video memory bit width*/ - uint32_t vram_bit_width; + __u32 vram_bit_width; /* vce harvesting instance */ - uint32_t vce_harvest_config; + __u32 vce_harvest_config; };
struct drm_amdgpu_info_hw_ip { /** Version of h/w IP */ - uint32_t hw_ip_version_major; - uint32_t hw_ip_version_minor; + __u32 hw_ip_version_major; + __u32 hw_ip_version_minor; /** Capabilities */ - uint64_t capabilities_flags; + __u64 capabilities_flags; /** command buffer address start alignment*/ - uint32_t ib_start_alignment; + __u32 ib_start_alignment; /** command buffer size alignment*/ - uint32_t ib_size_alignment; + __u32 ib_size_alignment; /** Bitmask of available rings. Bit 0 means ring 0, etc. */ - uint32_t available_rings; - uint32_t _pad; + __u32 available_rings; + __u32 _pad; };
/*
Kernel headers should use linux/types.h
Signed-off-by: Gabriel Laskar gabriel@lse.epita.fr --- include/uapi/drm/radeon_drm.h | 130 +++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 64 deletions(-)
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 01aa2a8..84a32ce 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -35,6 +35,8 @@
#include "drm.h"
+#include <linux/types.h> + /* WARNING: If you change any of these defines, make sure to change the * defines in the X server file (radeon_sarea.h) */ @@ -793,9 +795,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 +809,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 +827,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 +852,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 +937,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 +963,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 +1044,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
Kernel headers should use linux/types.h
Signed-off-by: Gabriel Laskar gabriel@lse.epita.fr --- include/uapi/drm/drm_mode.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h index 6c11ca4..44ad794 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -526,14 +526,14 @@ struct drm_mode_crtc_page_flip {
/* create a dumb scanout buffer */ struct drm_mode_create_dumb { - uint32_t height; - uint32_t width; - uint32_t bpp; - uint32_t flags; + __u32 height; + __u32 width; + __u32 bpp; + __u32 flags; /* handle, pitch, size will be returned */ - uint32_t handle; - uint32_t pitch; - uint64_t size; + __u32 handle; + __u32 pitch; + __u64 size; };
/* set up for mmap of a dumb scanout buffer */ @@ -550,7 +550,7 @@ struct drm_mode_map_dumb { };
struct drm_mode_destroy_dumb { - uint32_t handle; + __u32 handle; };
/* page-flip flags are valid, plus: */
Kernel headers should use linux/types.h
Signed-off-by: Gabriel Laskar gabriel@lse.epita.fr --- include/uapi/drm/vmwgfx_drm.h | 264 +++++++++++++++++++++--------------------- 1 file changed, 132 insertions(+), 132 deletions(-)
diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h index 05b2049..ef31f44 100644 --- a/include/uapi/drm/vmwgfx_drm.h +++ b/include/uapi/drm/vmwgfx_drm.h @@ -111,9 +111,9 @@ enum drm_vmw_handle_type { */
struct drm_vmw_getparam_arg { - uint64_t value; - uint32_t param; - uint32_t pad64; + __u64 value; + __u32 param; + __u32 pad64; };
/*************************************************************************/ @@ -134,8 +134,8 @@ struct drm_vmw_getparam_arg { */
struct drm_vmw_context_arg { - int32_t cid; - uint32_t pad64; + __s32 cid; + __u32 pad64; };
/*************************************************************************/ @@ -165,7 +165,7 @@ struct drm_vmw_context_arg { * @mip_levels: Number of mip levels for each face. * An unused face should have 0 encoded. * @size_addr: Address of a user-space array of sruct drm_vmw_size - * cast to an uint64_t for 32-64 bit compatibility. + * cast to an __u64 for 32-64 bit compatibility. * The size of the array should equal the total number of mipmap levels. * @shareable: Boolean whether other clients (as identified by file descriptors) * may reference this surface. @@ -177,12 +177,12 @@ struct drm_vmw_context_arg { */
struct drm_vmw_surface_create_req { - uint32_t flags; - uint32_t format; - uint32_t mip_levels[DRM_VMW_MAX_SURFACE_FACES]; - uint64_t size_addr; - int32_t shareable; - int32_t scanout; + __u32 flags; + __u32 format; + __u32 mip_levels[DRM_VMW_MAX_SURFACE_FACES]; + __u64 size_addr; + __s32 shareable; + __s32 scanout; };
/** @@ -197,7 +197,7 @@ struct drm_vmw_surface_create_req { */
struct drm_vmw_surface_arg { - int32_t sid; + __s32 sid; enum drm_vmw_handle_type handle_type; };
@@ -213,10 +213,10 @@ struct drm_vmw_surface_arg { */
struct drm_vmw_size { - uint32_t width; - uint32_t height; - uint32_t depth; - uint32_t pad64; + __u32 width; + __u32 height; + __u32 depth; + __u32 pad64; };
/** @@ -284,13 +284,13 @@ union drm_vmw_surface_reference_arg { /** * struct drm_vmw_execbuf_arg * - * @commands: User-space address of a command buffer cast to an uint64_t. + * @commands: User-space address of a command buffer cast to an __u64. * @command-size: Size in bytes of the command buffer. * @throttle-us: Sleep until software is less than @throttle_us * microseconds ahead of hardware. The driver may round this value * to the nearest kernel tick. * @fence_rep: User-space address of a struct drm_vmw_fence_rep cast to an - * uint64_t. + * __u64. * @version: Allows expanding the execbuf ioctl parameters without breaking * backwards compatibility, since user-space will always tell the kernel * which version it uses. @@ -302,14 +302,14 @@ union drm_vmw_surface_reference_arg { #define DRM_VMW_EXECBUF_VERSION 2
struct drm_vmw_execbuf_arg { - uint64_t commands; - uint32_t command_size; - uint32_t throttle_us; - uint64_t fence_rep; - uint32_t version; - uint32_t flags; - uint32_t context_handle; - uint32_t pad64; + __u64 commands; + __u32 command_size; + __u32 throttle_us; + __u64 fence_rep; + __u32 version; + __u32 flags; + __u32 context_handle; + __u32 pad64; };
/** @@ -338,12 +338,12 @@ struct drm_vmw_execbuf_arg { */
struct drm_vmw_fence_rep { - uint32_t handle; - uint32_t mask; - uint32_t seqno; - uint32_t passed_seqno; - uint32_t pad64; - int32_t error; + __u32 handle; + __u32 mask; + __u32 seqno; + __u32 passed_seqno; + __u32 pad64; + __s32 error; };
/*************************************************************************/ @@ -373,8 +373,8 @@ struct drm_vmw_fence_rep { */
struct drm_vmw_alloc_dmabuf_req { - uint32_t size; - uint32_t pad64; + __u32 size; + __u32 pad64; };
/** @@ -391,11 +391,11 @@ struct drm_vmw_alloc_dmabuf_req { */
struct drm_vmw_dmabuf_rep { - uint64_t map_handle; - uint32_t handle; - uint32_t cur_gmr_id; - uint32_t cur_gmr_offset; - uint32_t pad64; + __u64 map_handle; + __u32 handle; + __u32 cur_gmr_id; + __u32 cur_gmr_offset; + __u32 pad64; };
/** @@ -428,8 +428,8 @@ union drm_vmw_alloc_dmabuf_arg { */
struct drm_vmw_unref_dmabuf_arg { - uint32_t handle; - uint32_t pad64; + __u32 handle; + __u32 pad64; };
/*************************************************************************/ @@ -452,10 +452,10 @@ struct drm_vmw_unref_dmabuf_arg { */
struct drm_vmw_rect { - int32_t x; - int32_t y; - uint32_t w; - uint32_t h; + __s32 x; + __s32 y; + __u32 w; + __u32 h; };
/** @@ -477,21 +477,21 @@ struct drm_vmw_rect { */
struct drm_vmw_control_stream_arg { - uint32_t stream_id; - uint32_t enabled; + __u32 stream_id; + __u32 enabled;
- uint32_t flags; - uint32_t color_key; + __u32 flags; + __u32 color_key;
- uint32_t handle; - uint32_t offset; - int32_t format; - uint32_t size; - uint32_t width; - uint32_t height; - uint32_t pitch[3]; + __u32 handle; + __u32 offset; + __s32 format; + __u32 size; + __u32 width; + __u32 height; + __u32 pitch[3];
- uint32_t pad64; + __u32 pad64; struct drm_vmw_rect src; struct drm_vmw_rect dst; }; @@ -519,12 +519,12 @@ struct drm_vmw_control_stream_arg { */
struct drm_vmw_cursor_bypass_arg { - uint32_t flags; - uint32_t crtc_id; - int32_t xpos; - int32_t ypos; - int32_t xhot; - int32_t yhot; + __u32 flags; + __u32 crtc_id; + __s32 xpos; + __s32 ypos; + __s32 xhot; + __s32 yhot; };
/*************************************************************************/ @@ -542,8 +542,8 @@ struct drm_vmw_cursor_bypass_arg { */
struct drm_vmw_stream_arg { - uint32_t stream_id; - uint32_t pad64; + __u32 stream_id; + __u32 pad64; };
/*************************************************************************/ @@ -565,7 +565,7 @@ struct drm_vmw_stream_arg { /** * struct drm_vmw_get_3d_cap_arg * - * @buffer: Pointer to a buffer for capability data, cast to an uint64_t + * @buffer: Pointer to a buffer for capability data, cast to an __u64 * @size: Max size to copy * * Input argument to the DRM_VMW_GET_3D_CAP_IOCTL @@ -573,9 +573,9 @@ struct drm_vmw_stream_arg { */
struct drm_vmw_get_3d_cap_arg { - uint64_t buffer; - uint32_t max_size; - uint32_t pad64; + __u64 buffer; + __u32 max_size; + __u32 pad64; };
/*************************************************************************/ @@ -624,14 +624,14 @@ struct drm_vmw_get_3d_cap_arg { */
struct drm_vmw_fence_wait_arg { - uint32_t handle; - int32_t cookie_valid; - uint64_t kernel_cookie; - uint64_t timeout_us; - int32_t lazy; - int32_t flags; - int32_t wait_options; - int32_t pad64; + __u32 handle; + __s32 cookie_valid; + __u64 kernel_cookie; + __u64 timeout_us; + __s32 lazy; + __s32 flags; + __s32 wait_options; + __s32 pad64; };
/*************************************************************************/ @@ -655,12 +655,12 @@ struct drm_vmw_fence_wait_arg { */
struct drm_vmw_fence_signaled_arg { - uint32_t handle; - uint32_t flags; - int32_t signaled; - uint32_t passed_seqno; - uint32_t signaled_flags; - uint32_t pad64; + __u32 handle; + __u32 flags; + __s32 signaled; + __u32 passed_seqno; + __u32 signaled_flags; + __u32 pad64; };
/*************************************************************************/ @@ -681,8 +681,8 @@ struct drm_vmw_fence_signaled_arg { */
struct drm_vmw_fence_arg { - uint32_t handle; - uint32_t pad64; + __u32 handle; + __u32 pad64; };
@@ -703,9 +703,9 @@ struct drm_vmw_fence_arg {
struct drm_vmw_event_fence { struct drm_event base; - uint64_t user_data; - uint32_t tv_sec; - uint32_t tv_usec; + __u64 user_data; + __u32 tv_sec; + __u32 tv_usec; };
/* @@ -717,17 +717,17 @@ struct drm_vmw_event_fence { /** * struct drm_vmw_fence_event_arg * - * @fence_rep: Pointer to fence_rep structure cast to uint64_t or 0 if + * @fence_rep: Pointer to fence_rep structure cast to __u64 or 0 if * the fence is not supposed to be referenced by user-space. * @user_info: Info to be delivered with the event. * @handle: Attach the event to this fence only. * @flags: A set of flags as defined above. */ struct drm_vmw_fence_event_arg { - uint64_t fence_rep; - uint64_t user_data; - uint32_t handle; - uint32_t flags; + __u64 fence_rep; + __u64 user_data; + __u32 handle; + __u32 flags; };
@@ -747,7 +747,7 @@ struct drm_vmw_fence_event_arg { * @sid: Surface id to present from. * @dest_x: X placement coordinate for surface. * @dest_y: Y placement coordinate for surface. - * @clips_ptr: Pointer to an array of clip rects cast to an uint64_t. + * @clips_ptr: Pointer to an array of clip rects cast to an __u64. * @num_clips: Number of cliprects given relative to the framebuffer origin, * in the same coordinate space as the frame buffer. * @pad64: Unused 64-bit padding. @@ -756,13 +756,13 @@ struct drm_vmw_fence_event_arg { */
struct drm_vmw_present_arg { - uint32_t fb_id; - uint32_t sid; - int32_t dest_x; - int32_t dest_y; - uint64_t clips_ptr; - uint32_t num_clips; - uint32_t pad64; + __u32 fb_id; + __u32 sid; + __s32 dest_x; + __s32 dest_y; + __u64 clips_ptr; + __u32 num_clips; + __u32 pad64; };
@@ -780,16 +780,16 @@ struct drm_vmw_present_arg { * struct drm_vmw_present_arg * @fb_id: fb_id to present / read back from. * @num_clips: Number of cliprects. - * @clips_ptr: Pointer to an array of clip rects cast to an uint64_t. - * @fence_rep: Pointer to a struct drm_vmw_fence_rep, cast to an uint64_t. + * @clips_ptr: Pointer to an array of clip rects cast to an __u64. + * @fence_rep: Pointer to a struct drm_vmw_fence_rep, cast to an __u64. * If this member is NULL, then the ioctl should not return a fence. */
struct drm_vmw_present_readback_arg { - uint32_t fb_id; - uint32_t num_clips; - uint64_t clips_ptr; - uint64_t fence_rep; + __u32 fb_id; + __u32 num_clips; + __u64 clips_ptr; + __u64 fence_rep; };
/*************************************************************************/ @@ -805,14 +805,14 @@ struct drm_vmw_present_readback_arg { * struct drm_vmw_update_layout_arg * * @num_outputs: number of active connectors - * @rects: pointer to array of drm_vmw_rect cast to an uint64_t + * @rects: pointer to array of drm_vmw_rect cast to an __u64 * * Input argument to the DRM_VMW_UPDATE_LAYOUT Ioctl. */ struct drm_vmw_update_layout_arg { - uint32_t num_outputs; - uint32_t pad64; - uint64_t rects; + __u32 num_outputs; + __u32 pad64; + __u64 rects; };
@@ -849,10 +849,10 @@ enum drm_vmw_shader_type { */ struct drm_vmw_shader_create_arg { enum drm_vmw_shader_type shader_type; - uint32_t size; - uint32_t buffer_handle; - uint32_t shader_handle; - uint64_t offset; + __u32 size; + __u32 buffer_handle; + __u32 shader_handle; + __u64 offset; };
/*************************************************************************/ @@ -871,8 +871,8 @@ struct drm_vmw_shader_create_arg { * Input argument to the DRM_VMW_UNREF_SHADER ioctl. */ struct drm_vmw_shader_arg { - uint32_t handle; - uint32_t pad64; + __u32 handle; + __u32 pad64; };
/*************************************************************************/ @@ -918,14 +918,14 @@ enum drm_vmw_surface_flags { * Part of output argument for the DRM_VMW_GB_SURFACE_REF Ioctl. */ struct drm_vmw_gb_surface_create_req { - uint32_t svga3d_flags; - uint32_t format; - uint32_t mip_levels; + __u32 svga3d_flags; + __u32 format; + __u32 mip_levels; enum drm_vmw_surface_flags drm_surface_flags; - uint32_t multisample_count; - uint32_t autogen_filter; - uint32_t buffer_handle; - uint32_t array_size; + __u32 multisample_count; + __u32 autogen_filter; + __u32 buffer_handle; + __u32 array_size; struct drm_vmw_size base_size; };
@@ -944,11 +944,11 @@ struct drm_vmw_gb_surface_create_req { * Output argument for the DRM_VMW_GB_SURFACE_CREATE ioctl. */ struct drm_vmw_gb_surface_create_rep { - uint32_t handle; - uint32_t backup_size; - uint32_t buffer_handle; - uint32_t buffer_size; - uint64_t buffer_map_handle; + __u32 handle; + __u32 backup_size; + __u32 buffer_handle; + __u32 buffer_size; + __u64 buffer_map_handle; };
/** @@ -1061,8 +1061,8 @@ enum drm_vmw_synccpu_op { struct drm_vmw_synccpu_arg { enum drm_vmw_synccpu_op op; enum drm_vmw_synccpu_flags flags; - uint32_t handle; - uint32_t pad64; + __u32 handle; + __u32 pad64; };
/*************************************************************************/
Kernel headers should use linux/types.h
Signed-off-by: Gabriel Laskar gabriel@lse.epita.fr --- include/uapi/drm/omap_drm.h | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/include/uapi/drm/omap_drm.h b/include/uapi/drm/omap_drm.h index 1d0b117..926e42a 100644 --- a/include/uapi/drm/omap_drm.h +++ b/include/uapi/drm/omap_drm.h @@ -21,6 +21,7 @@ #define __OMAP_DRM_H__
#include <drm/drm.h> +#include <linux/types.h>
/* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. @@ -29,8 +30,8 @@ #define OMAP_PARAM_CHIPSET_ID 1 /* ie. 0x3430, 0x4430, etc */
struct drm_omap_param { - uint64_t param; /* in */ - uint64_t value; /* in (set_param), out (get_param) */ + __u64 param; /* in */ + __u64 value; /* in (set_param), out (get_param) */ };
#define OMAP_BO_SCANOUT 0x00000001 /* scanout capable (phys contiguous) */ @@ -49,18 +50,18 @@ struct drm_omap_param { #define OMAP_BO_TILED (OMAP_BO_TILED_8 | OMAP_BO_TILED_16 | OMAP_BO_TILED_32)
union omap_gem_size { - uint32_t bytes; /* (for non-tiled formats) */ + __u32 bytes; /* (for non-tiled formats) */ struct { - uint16_t width; - uint16_t height; + __u16 width; + __u16 height; } tiled; /* (for tiled formats) */ };
struct drm_omap_gem_new { union omap_gem_size size; /* in */ - uint32_t flags; /* in */ - uint32_t handle; /* out */ - uint32_t __pad; + __u32 flags; /* in */ + __u32 handle; /* out */ + __u32 __pad; };
/* mask of operations: */ @@ -70,33 +71,33 @@ enum omap_gem_op { };
struct drm_omap_gem_cpu_prep { - uint32_t handle; /* buffer handle (in) */ - uint32_t op; /* mask of omap_gem_op (in) */ + __u32 handle; /* buffer handle (in) */ + __u32 op; /* mask of omap_gem_op (in) */ };
struct drm_omap_gem_cpu_fini { - uint32_t handle; /* buffer handle (in) */ - uint32_t op; /* mask of omap_gem_op (in) */ + __u32 handle; /* buffer handle (in) */ + __u32 op; /* mask of omap_gem_op (in) */ /* TODO maybe here we pass down info about what regions are touched * by sw so we can be clever about cache ops? For now a placeholder, * set to zero and we just do full buffer flush.. */ - uint32_t nregions; - uint32_t __pad; + __u32 nregions; + __u32 __pad; };
struct drm_omap_gem_info { - uint32_t handle; /* buffer handle (in) */ - uint32_t pad; - uint64_t offset; /* mmap offset (out) */ + __u32 handle; /* buffer handle (in) */ + __u32 pad; + __u64 offset; /* mmap offset (out) */ /* note: in case of tiled buffers, the user virtual size can be * different from the physical size (ie. how many pages are needed * to back the object) which is returned in DRM_IOCTL_GEM_OPEN.. * This size here is the one that should be used if you want to * mmap() the buffer: */ - uint32_t size; /* virtual size for mmap'ing (out) */ - uint32_t __pad; + __u32 size; /* virtual size for mmap'ing (out) */ + __u32 __pad; };
#define DRM_OMAP_GET_PARAM 0x00
Hi Gabriel,
Interestingly enough we had a person (gaby) asking about this over at #dri-devel, and I forwarded him to the work of Mikko Rapeli. You don't happen to be that person do you ?
On 12 November 2015 at 18:14, Gabriel Laskar gabriel@lse.epita.fr wrote:
Public headers should use types from include/uapi/linux/types.h.
Please don't do this. As mentioned to Mikko, these headers are meant to be used in more places than just Linux. All the compatibility is handled in drm.h so we might as well use it.
That aside I'm a strong supporter of this type of work and I'm curious why Dave hasn't picked up the existing series ? Last time I've asked he did not have any objections.
Dave, Did you see any issues with these that changed your mind or did it slip through the cracks ?
Regards, Emil
On Thu, 12 Nov 2015 19:34:18 +0000 Emil Velikov emil.l.velikov@gmail.com wrote:
Hi Gabriel,
Interestingly enough we had a person (gaby) asking about this over at #dri-devel, and I forwarded him to the work of Mikko Rapeli. You don't happen to be that person do you ?
Yes, that's me.
On 12 November 2015 at 18:14, Gabriel Laskar gabriel@lse.epita.fr wrote:
Public headers should use types from include/uapi/linux/types.h.
Please don't do this. As mentioned to Mikko, these headers are meant to be used in more places than just Linux. All the compatibility is handled in drm.h so we might as well use it.
So, I have take a deeper look, and I think I now get it. On bsd, the headers are taken from linux, and drm is ported from that, so we need, in order to be nice to them to limit the linux specific parts to a minimum.
So no more inclusion of linux/types.h inside all the drm headers, and just in drm.h.
That aside I'm a strong supporter of this type of work and I'm curious why Dave hasn't picked up the existing series ? Last time I've asked he did not have any objections.
Last patches send my Mikko were not picked, at least not these parts, and I think this way is better, although it is a bigger change.
When including a drm header, even with drm.h used before, we have errors related to the usage of types from stdint.h.
$ cat test-drm.c #include <drm.h> #include <qxl_drm.h> int main(void) { return 0; } $ gcc -I /usr/include/libdrm -fsyntax-only test-drm.c In file included from test-drm.c:1:0: /usr/include/libdrm/drm.h:132:2: error: unknown type name ‘size_t’ size_t name_len; /**< Length of name buffer */ ^ /usr/include/libdrm/drm.h:134:2: error: unknown type name ‘size_t’ size_t date_len; /**< Length of date buffer */ ^ /usr/include/libdrm/drm.h:136:2: error: unknown type name ‘size_t’ size_t desc_len; /**< Length of desc buffer */ ^ /usr/include/libdrm/drm.h:146:2: error: unknown type name ‘size_t’ size_t unique_len; /**< Length of unique */ ^ In file included from test-drm.c:2:0: /usr/include/libdrm/qxl_drm.h:51:2: error: unknown type name ‘uint32_t’ uint32_t size; ^ /usr/include/libdrm/qxl_drm.h:52:2: error: unknown type name ‘uint32_t’ uint32_t handle; /* 0 is an invalid handle */ ^ /usr/include/libdrm/qxl_drm.h:56:2: error: unknown type name ‘uint64_t’ uint64_t offset; /* use for mmap system call */ ^ /usr/include/libdrm/qxl_drm.h:57:2: error: unknown type name ‘uint32_t’ uint32_t handle; ^ [...]
There is 2 way to avoid that:
* include stdint.h in drm.h * rename all the types to use __u{32,64} types that are already defined for the bsd guys inside drm.h
The first way is a small change, but we use the libc headers inside the headers from the kernel. As we should have no dependencies, this is not ideal.
On the other side, we rename the types, and it is working the same way for bsd.
I realize that I have forgot to include one of my patches (Mikko probably has the same, I don't remember, I'll check, and if that's the case, I'll add his name to the commit) that fix the usage of size_t into __kernel_size_t (and defines it for the bas path).
With those changes, do you think it'll be better?
tl;dr:
I will send a new patchset with no more inclusion of linux/types.h, types changed from uint32_t to __u32 (and its friends) and size_t changed into __kernel_size_t. And I'll retake a look on the other patches to give credit for Mikko.
On Fri, 13 Nov 2015 20:24:30 +0100 Gabriel Laskar gabriel@lse.epita.fr wrote:
On Thu, 12 Nov 2015 19:34:18 +0000 Emil Velikov emil.l.velikov@gmail.com wrote:
That aside I'm a strong supporter of this type of work and I'm curious why Dave hasn't picked up the existing series ? Last time I've asked he did not have any objections.
Ok, I am re-reading the patchsets now, and I didn't have seen the last versions, sorry for the noise, this is just not yet synchronized across all trees.
Sorry for the noise, I had just saw the first version.
On 13 November 2015 at 19:31, Gabriel Laskar gabriel@lse.epita.fr wrote:
On Fri, 13 Nov 2015 20:24:30 +0100 Gabriel Laskar gabriel@lse.epita.fr wrote:
On Thu, 12 Nov 2015 19:34:18 +0000 Emil Velikov emil.l.velikov@gmail.com wrote:
That aside I'm a strong supporter of this type of work and I'm curious why Dave hasn't picked up the existing series ? Last time I've asked he did not have any objections.
Ok, I am re-reading the patchsets now, and I didn't have seen the last versions, sorry for the noise, this is just not yet synchronized across all trees.
Sorry for the noise, I had just saw the first version.
Heh I was wondering what's happening. I guess I should have been more helpful and given you a link, rather than just throwing you a name. Sorry about that.
From a very quick look I believe that the only part that is not
covered by Mikko is virtgpu_drm.h as it landed recently. Other than that - with the explicit include of drm.h from the respective headers, and the stdint to __foo type conversion things should actually work. Slowly but steadily we're getting there !
Regards, Emil
On Fri, 13 Nov 2015 20:38:51 +0000 Emil Velikov emil.l.velikov@gmail.com wrote:
On 13 November 2015 at 19:31, Gabriel Laskar gabriel@lse.epita.fr wrote:
On Fri, 13 Nov 2015 20:24:30 +0100 Gabriel Laskar gabriel@lse.epita.fr wrote:
Sorry for the noise, I had just saw the first version.
Heh I was wondering what's happening. I guess I should have been more helpful and given you a link, rather than just throwing you a name. Sorry about that.
No worries, I will check a little more next time.
From a very quick look I believe that the only part that is not covered by Mikko is virtgpu_drm.h as it landed recently. Other than that - with the explicit include of drm.h from the respective headers, and the stdint to __foo type conversion things should actually work.
I will resend that patch.
There is still some issues on the headers, like the inclusion of drm.h.
AFAIK, we should include "drm.h", in order to minimize the changes between linux/libdrm when importing, as the folders are not always the same (on Archlinux for example, drm.h is installed in /usr/include/libdrm/drm.h). This is not always the case in some of the headers:
* drm_sarea.h * exynos_drm.h * i810_drm.h * i915_drm.h * mga_drm.h * msm_drm.h * nouveau_drm.h * omap_drm.h * r128_drm.h * savage_drm.h * tegra_drm.h * via_drm.h * vmwgfx_drm.h (with #ifndef __KERNEL__ guards around it)
* there is still some headers that are including stddef.h for no visible reasons (msm_drm.h and qxl_drm.h). * drm_fourcc.h and drm_mode.h are still using linux/types.h
I can send patches for them too, I just need to know if this is useful, and not just nitpicking for you.
On 13 November 2015 at 21:36, Gabriel Laskar gabriel@lse.epita.fr wrote:
On Fri, 13 Nov 2015 20:38:51 +0000 Emil Velikov emil.l.velikov@gmail.com wrote:
On 13 November 2015 at 19:31, Gabriel Laskar gabriel@lse.epita.fr wrote:
On Fri, 13 Nov 2015 20:24:30 +0100 Gabriel Laskar gabriel@lse.epita.fr wrote:
Sorry for the noise, I had just saw the first version.
Heh I was wondering what's happening. I guess I should have been more helpful and given you a link, rather than just throwing you a name. Sorry about that.
No worries, I will check a little more next time.
From a very quick look I believe that the only part that is not covered by Mikko is virtgpu_drm.h as it landed recently. Other than that - with the explicit include of drm.h from the respective headers, and the stdint to __foo type conversion things should actually work.
I will resend that patch.
There is still some issues on the headers, like the inclusion of drm.h.
AFAIK, we should include "drm.h", in order to minimize the changes between linux/libdrm when importing, as the folders are not always the same (on Archlinux for example, drm.h is installed in /usr/include/libdrm/drm.h). This is not always the case in some of the headers:
I'm afraid we cannot do this. Things should just work without the extra include directive (from your earlier example). We can easily fix this and other issues in an automated way during import.
- drm_sarea.h
- exynos_drm.h
- i810_drm.h
- i915_drm.h
- mga_drm.h
- msm_drm.h
- nouveau_drm.h
- omap_drm.h
- r128_drm.h
- savage_drm.h
- tegra_drm.h
- via_drm.h
- vmwgfx_drm.h (with #ifndef __KERNEL__ guards around it)
Imho we should drop the guard and keep the include.
- there is still some headers that are including stddef.h for no visible reasons (msm_drm.h and qxl_drm.h).
I'd assume those are added for size_t. Which interestingly enough isn't used in either header. I'm leaning that we can nuke it.
- drm_fourcc.h and drm_mode.h are still using linux/types.h
Did not see (even expect) those - good catch. The #include drm/drm.h should suffice there imho.
I can send patches for them too, I just need to know if this is useful, and not just nitpicking for you.
Everything but the s|drm/drm.h|drm.h| suggestion is pretty valid imho.
As a follow up we can even make the headers C++ friendly, but that obviously is nothing for you to worry about :-)
Huge thanks for reviving this topic. Emil
On 14.11.2015 07:06, Emil Velikov wrote:
On 13 November 2015 at 21:36, Gabriel Laskar gabriel@lse.epita.fr wrote:
There is still some issues on the headers, like the inclusion of drm.h.
AFAIK, we should include "drm.h", in order to minimize the changes between linux/libdrm when importing, as the folders are not always the same (on Archlinux for example, drm.h is installed in /usr/include/libdrm/drm.h). This is not always the case in some of the headers:
I'm afraid we cannot do this. Things should just work without the extra include directive (from your earlier example). We can easily fix this and other issues in an automated way during import.
[...]
I can send patches for them too, I just need to know if this is useful, and not just nitpicking for you.
Everything but the s|drm/drm.h|drm.h| suggestion is pretty valid imho.
What's the problem with changing
#include <drm/drm.h>
to
#include "drm.h"
in include/uapi/drm/*_drm.h? I recently made that change in radeon_drm.h and amdgpu_drm.h for the reason Gabriel mentioned above (in particular amdgpu_drm.h is now basically identical between the kernel and libdrm trees), and I haven't noticed any problems because of that.
On 17 November 2015 at 07:22, Michel Dänzer michel@daenzer.net wrote:
On 14.11.2015 07:06, Emil Velikov wrote:
On 13 November 2015 at 21:36, Gabriel Laskar gabriel@lse.epita.fr wrote:
There is still some issues on the headers, like the inclusion of drm.h.
AFAIK, we should include "drm.h", in order to minimize the changes between linux/libdrm when importing, as the folders are not always the same (on Archlinux for example, drm.h is installed in /usr/include/libdrm/drm.h). This is not always the case in some of the headers:
I'm afraid we cannot do this. Things should just work without the extra include directive (from your earlier example). We can easily fix this and other issues in an automated way during import.
[...]
I can send patches for them too, I just need to know if this is useful, and not just nitpicking for you.
Everything but the s|drm/drm.h|drm.h| suggestion is pretty valid imho.
What's the problem with changing
#include <drm/drm.h>
to
#include "drm.h"
in include/uapi/drm/*_drm.h? I recently made that change in radeon_drm.h and amdgpu_drm.h for the reason Gabriel mentioned above (in particular amdgpu_drm.h is now basically identical between the kernel and libdrm trees), and I haven't noticed any problems because of that.
I believe you're getting confused Michel. You did such change in libdrm not the kernel... unless these changes haven't hit -next yet ?
Let me elaborate on the whole thing:
The kernel UAPI headers: - Used by the kernel modules and userspace(?) - Installed in /usr/include/drm - Many distributions do _not_ ship them - Broken for years (mostly fixed with Mikko's earlier patches) - For the above two reasons - most (all?) userspace uses the libdrm ones.
The libdrm headers: - Mostly preprocessed version of the above, used solely by userspace - Installed in /usr/include/libdrm - All distros ship them - Desperately out of sync wrt the above
With the above said: - I was thinking about hiding the UAPI ones, although Dave suggested against it. - Doing s|drm/drm.h|drm.h| will break compilation: + for the kernel - as we don't add the foo/drm/ to the include directive, + for any hacked up userspace - very unlikely that they have the include, considering that things work without it. - Differences wrt libdrm userspace - all of which can be handled with simple sed + __KERNEL__ never defined so we can just ignore it + __user + drm/drm.h + others ?
Fwiw I still believe that the best solution is to "hide" the UAPI headers, esp since they've been busted for a while. Then we can drop the "drm/" and fix any in-kernel breakage. That said we will need to convince Dave ;-)
Alternatively I suggest that we carry on with my earlier suggestion. That is, unless someone comes with a better plan which doesn't involve ignoring the problem :-P
Cheers, Emil
On Tue, 17 Nov 2015 11:08:12 +0000 Emil Velikov emil.l.velikov@gmail.com wrote:
With the above said:
- I was thinking about hiding the UAPI ones, although Dave suggested
against it.
- Doing s|drm/drm.h|drm.h| will break compilation:
- for the kernel - as we don't add the foo/drm/ to the include directive,
- for any hacked up userspace - very unlikely that they have the
include, considering that things work without it.
We are not suggesting doing s|drm/drm.h|drm.h| but by replacing
#include <drm/drm.h>
by
#include "drm.h"
The header will be picked-up correclty in kernel, and in userland.
Is it possible to also resynchronize both headers, in order for them to be the same in libdrm and the kernel ?
On 17 November 2015 at 19:13, Gabriel Laskar gabriel@lse.epita.fr wrote:
On Tue, 17 Nov 2015 11:08:12 +0000 Emil Velikov emil.l.velikov@gmail.com wrote:
With the above said:
- I was thinking about hiding the UAPI ones, although Dave suggested
against it.
- Doing s|drm/drm.h|drm.h| will break compilation:
- for the kernel - as we don't add the foo/drm/ to the include directive,
- for any hacked up userspace - very unlikely that they have the
include, considering that things work without it.
We are not suggesting doing s|drm/drm.h|drm.h| but by replacing
#include <drm/drm.h>
by
#include "drm.h"
The header will be picked-up correclty in kernel, and in userland.
Missed out completely on the <> vs "" side. Imho using the latter the kernel will be ok, although for userspace that's not a good idea. What will happen if there is a drm.h next to the .c files (I know bad programmer) ?
Imho it seems quite fragile although if people refer it so be it. I'm just going to chip-in "I told you so" as we get the above case :-)
Is it possible to also resynchronize both headers, in order for them to be the same in libdrm and the kernel ?
Of course, it's perfectly doable. First steps towards it are here (people like yourself and Mikko that want things fixed). We need just a couple more steps.
Regards, Emil
On 18.11.2015 06:22, Emil Velikov wrote:
On 17 November 2015 at 19:13, Gabriel Laskar gabriel@lse.epita.fr wrote:
On Tue, 17 Nov 2015 11:08:12 +0000 Emil Velikov emil.l.velikov@gmail.com wrote:
With the above said:
- I was thinking about hiding the UAPI ones, although Dave suggested
against it.
- Doing s|drm/drm.h|drm.h| will break compilation:
- for the kernel - as we don't add the foo/drm/ to the include directive,
- for any hacked up userspace - very unlikely that they have the
include, considering that things work without it.
We are not suggesting doing s|drm/drm.h|drm.h| but by replacing
#include <drm/drm.h>
by
#include "drm.h"
The header will be picked-up correclty in kernel, and in userland.
Missed out completely on the <> vs "" side. Imho using the latter the kernel will be ok, although for userspace that's not a good idea. What will happen if there is a drm.h next to the .c files (I know bad programmer) ?
Nothing, at least not with gcc: https://gcc.gnu.org/onlinedocs/cpp/Search-Path.html
GCC looks for headers requested with #include "file" first in the directory containing the current file, then in the directories as specified by -iquote options, then in the same places it would have looked for a header requested with angle brackets. For example, if /usr/include/sys/stat.h contains #include "types.h", GCC looks for types.h first in /usr/include/sys, then in its usual search path.
So #include "drm.h" always picks up drm.h from the same directory where *_drm.h is.
A for me being confused:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/inclu...
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/inclu...
On 18 November 2015 at 03:12, Michel Dänzer michel@daenzer.net wrote:
On 18.11.2015 06:22, Emil Velikov wrote:
On 17 November 2015 at 19:13, Gabriel Laskar gabriel@lse.epita.fr wrote:
On Tue, 17 Nov 2015 11:08:12 +0000 Emil Velikov emil.l.velikov@gmail.com wrote:
With the above said:
- I was thinking about hiding the UAPI ones, although Dave suggested
against it.
- Doing s|drm/drm.h|drm.h| will break compilation:
- for the kernel - as we don't add the foo/drm/ to the include directive,
- for any hacked up userspace - very unlikely that they have the
include, considering that things work without it.
We are not suggesting doing s|drm/drm.h|drm.h| but by replacing
#include <drm/drm.h>
by
#include "drm.h"
The header will be picked-up correclty in kernel, and in userland.
Missed out completely on the <> vs "" side. Imho using the latter the kernel will be ok, although for userspace that's not a good idea. What will happen if there is a drm.h next to the .c files (I know bad programmer) ?
Nothing, at least not with gcc: https://gcc.gnu.org/onlinedocs/cpp/Search-Path.html
GCC looks for headers requested with #include "file" first in the directory containing the current file, then in the directories as specified by -iquote options, then in the same places it would have looked for a header requested with angle brackets. For example, if /usr/include/sys/stat.h contains #include "types.h", GCC looks for types.h first in /usr/include/sys, then in its usual search path.
So #include "drm.h" always picks up drm.h from the same directory where *_drm.h is.
Seems that I've failed with my earlier tests. As you pointed things just work.
A for me being confused:
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/inclu...
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/inclu...
Not sure what I've were smoking earlier. Thanks for straightening me out.
/me puts a brown bag and moves on with other things
Cheers Emil
The kernel UAPI headers:
- Used by the kernel modules and userspace(?)
- Installed in /usr/include/drm
- Many distributions do _not_ ship them
- Broken for years (mostly fixed with Mikko's earlier patches)
- For the above two reasons - most (all?) userspace uses the libdrm ones.
No userspace uses them at all. Hence why we tend not to care less.
Userspace has never used them, and I'm not sure why userspace would need to use them at this point.
The libdrm headers:
- Mostly preprocessed version of the above, used solely by userspace
- Installed in /usr/include/libdrm
- All distros ship them
- Desperately out of sync wrt the above
I don't think they are that out of sync, it would be impossible for userspace to use new kernel features if they were that out of sync.
With the above said:
- I was thinking about hiding the UAPI ones, although Dave suggested
against it.
They are a legitimate kernel API, and show be exposed, probably should be made more useable outside the kernel, but for now using them inside the kernel is their primary use case.
- Doing s|drm/drm.h|drm.h| will break compilation:
- for the kernel - as we don't add the foo/drm/ to the include directive,
- for any hacked up userspace - very unlikely that they have the
include, considering that things work without it.
- Differences wrt libdrm userspace - all of which can be handled with
simple sed
- __KERNEL__ never defined so we can just ignore it
- __user
- drm/drm.h
- others ?
The kernel header geneartion script should strip a lot of stuff out, please look at the headers post kernel install not the ones in the kernel tree for comparison.
or ones in usr/include/drm inside a built kernel tree.
Dave.
On 17 November 2015 at 20:13, Dave Airlie airlied@gmail.com wrote:
The kernel UAPI headers:
- Used by the kernel modules and userspace(?)
- Installed in /usr/include/drm
- Many distributions do _not_ ship them
- Broken for years (mostly fixed with Mikko's earlier patches)
- For the above two reasons - most (all?) userspace uses the libdrm ones.
No userspace uses them at all. Hence why we tend not to care less.
Userspace has never used them, and I'm not sure why userspace would need to use them at this point.
The libdrm headers:
- Mostly preprocessed version of the above, used solely by userspace
- Installed in /usr/include/libdrm
- All distros ship them
- Desperately out of sync wrt the above
I don't think they are that out of sync, it would be impossible for userspace to use new kernel features if they were that out of sync.
I beg to differ. And the following diff stat seems to confirm it. Note that we have a massive hunk of #ifndef-erry in mesa (src/gallium/winsys/drm/radeon) and a fair bit in IGT (some of which to keep libdrm requirement low). There is also a ton in the intel ddx, but that's mostly because they don't like to zero initialise (use c99 initializers for) drm structs. Last time I've looked weston also had a few.
exynos/exynos_drm.h | 236 ++++++++++++++-- freedreno/msm/msm_drm.h | 103 ++++--- include/drm/amdgpu_drm.h | 2 +- include/drm/drm.h | 66 +++-- include/drm/drm_fourcc.h | 17 +- include/drm/drm_mode.h | 165 +++++++----- include/drm/drm_sarea.h | 6 +- include/drm/i915_drm.h | 46 +++- include/drm/mga_drm.h | 6 +- include/drm/nouveau_drm.h | 99 ++----- include/drm/qxl_drm.h | 2 +- include/drm/r128_drm.h | 2 + include/drm/radeon_drm.h | 44 ++- include/drm/savage_drm.h | 12 +- include/drm/sis_drm.h | 8 +- include/drm/tegra_drm.h | 5 +- include/drm/via_drm.h | 6 +- include/drm/vmwgfx_drm.h | 674 +++++++++++++++++++++++++++++++++++++++------- omap/omap_drm.h | 46 ++-- 19 files changed, 1125 insertions(+), 420 deletions(-)
Not to mention the missing {armada,i810,virtgpu}_drm.h. Fwiw I'm the one guilty for i810 one - there haven't been any users for it so I nuked it. Can bring it back if people prefer. On the armada front I'm leaning towards that we should nuke the header as it's for a DC only device.
With the above said:
- I was thinking about hiding the UAPI ones, although Dave suggested
against it.
They are a legitimate kernel API, and show be exposed, probably should be made more useable outside the kernel, but for now using them inside the kernel is their primary use case.
I never suggested that there should be no way for userspace to get access to them. libdrm seems like a good enough candidate imho. It takes care of any specific that may or may not be needed, it's used (almost?) everywhere and existing userspace just works :)
- Doing s|drm/drm.h|drm.h| will break compilation:
- for the kernel - as we don't add the foo/drm/ to the include directive,
- for any hacked up userspace - very unlikely that they have the
include, considering that things work without it.
- Differences wrt libdrm userspace - all of which can be handled with
simple sed
- __KERNEL__ never defined so we can just ignore it
- __user
- drm/drm.h
- others ?
The kernel header geneartion script should strip a lot of stuff out, please look at the headers post kernel install not the ones in the kernel tree for comparison.
or ones in usr/include/drm inside a built kernel tree.
People are like everything else in nature - seeking the path or least resistance. If you ask them to do 2 steps they will either do them once in a blue moon, or simply ignore the whole thing, sadly :-(
If we have/need anything fancy - sure lets use the said infra. Otherwise let's add one line of sed script in libdrm and be done with it :-P
Cheers, Emil
dri-devel@lists.freedesktop.org
-
Dave Airlie -
Emil Velikov -
Gabriel Laskar -
Michel Dänzer