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

uapi: fix linux/kfd_ioctl.h userspace compilation errors

Consistently use types provided by <linux/types.h> via <drm/drm.h>
to fix the following linux/kfd_ioctl.h userspace compilation errors:

/usr/include/linux/kfd_ioctl.h:236:2: error: unknown type name 'uint64_t'
uint64_t va_addr; /* to KFD */
/usr/include/linux/kfd_ioctl.h:237:2: error: unknown type name 'uint32_t'
uint32_t gpu_id; /* to KFD */
/usr/include/linux/kfd_ioctl.h:238:2: error: unknown type name 'uint32_t'
uint32_t pad;
/usr/include/linux/kfd_ioctl.h:243:2: error: unknown type name 'uint64_t'
uint64_t tile_config_ptr;
/usr/include/linux/kfd_ioctl.h:245:2: error: unknown type name 'uint64_t'
uint64_t macro_tile_config_ptr;
/usr/include/linux/kfd_ioctl.h:249:2: error: unknown type name 'uint32_t'
uint32_t num_tile_configs;
/usr/include/linux/kfd_ioctl.h:253:2: error: unknown type name 'uint32_t'
uint32_t num_macro_tile_configs;
/usr/include/linux/kfd_ioctl.h:255:2: error: unknown type name 'uint32_t'
uint32_t gpu_id; /* to KFD */
/usr/include/linux/kfd_ioctl.h:256:2: error: unknown type name 'uint32_t'
uint32_t gb_addr_config; /* from KFD */
/usr/include/linux/kfd_ioctl.h:257:2: error: unknown type name 'uint32_t'
uint32_t num_banks; /* from KFD */
/usr/include/linux/kfd_ioctl.h:258:2: error: unknown type name 'uint32_t'
uint32_t num_ranks; /* from KFD */

Fixes: 6a1c9510694fe ("drm/amdkfd: Adding new IOCTL for scratch memory v2")
Fixes: 5d71dbc3a5886 ("drm/amdkfd: Implement image tiling mode support v2")
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

authored by

Dmitry V. Levin and committed by
Oded Gabbay
b4d08520 c393e9b2

+11 -11
+11 -11
include/uapi/linux/kfd_ioctl.h
··· 233 233 }; 234 234 235 235 struct kfd_ioctl_set_scratch_backing_va_args { 236 - uint64_t va_addr; /* to KFD */ 237 - uint32_t gpu_id; /* to KFD */ 238 - uint32_t pad; 236 + __u64 va_addr; /* to KFD */ 237 + __u32 gpu_id; /* to KFD */ 238 + __u32 pad; 239 239 }; 240 240 241 241 struct kfd_ioctl_get_tile_config_args { 242 242 /* to KFD: pointer to tile array */ 243 - uint64_t tile_config_ptr; 243 + __u64 tile_config_ptr; 244 244 /* to KFD: pointer to macro tile array */ 245 - uint64_t macro_tile_config_ptr; 245 + __u64 macro_tile_config_ptr; 246 246 /* to KFD: array size allocated by user mode 247 247 * from KFD: array size filled by kernel 248 248 */ 249 - uint32_t num_tile_configs; 249 + __u32 num_tile_configs; 250 250 /* to KFD: array size allocated by user mode 251 251 * from KFD: array size filled by kernel 252 252 */ 253 - uint32_t num_macro_tile_configs; 253 + __u32 num_macro_tile_configs; 254 254 255 - uint32_t gpu_id; /* to KFD */ 256 - uint32_t gb_addr_config; /* from KFD */ 257 - uint32_t num_banks; /* from KFD */ 258 - uint32_t num_ranks; /* from KFD */ 255 + __u32 gpu_id; /* to KFD */ 256 + __u32 gb_addr_config; /* from KFD */ 257 + __u32 num_banks; /* from KFD */ 258 + __u32 num_ranks; /* from KFD */ 259 259 /* struct size can be extended later if needed 260 260 * without breaking ABI compatibility 261 261 */