* [PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors
@ 2017-11-13 0:35 Dmitry V. Levin
2017-11-13 16:11 ` Oded Gabbay
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry V. Levin @ 2017-11-13 0:35 UTC (permalink / raw)
To: Oded Gabbay; +Cc: dri-devel, linux-kernel
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>
---
include/uapi/linux/kfd_ioctl.h | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index 26283fefdf5f..f7015aa12347 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -233,29 +233,29 @@ struct kfd_ioctl_wait_events_args {
};
struct kfd_ioctl_set_scratch_backing_va_args {
- uint64_t va_addr; /* to KFD */
- uint32_t gpu_id; /* to KFD */
- uint32_t pad;
+ __u64 va_addr; /* to KFD */
+ __u32 gpu_id; /* to KFD */
+ __u32 pad;
};
struct kfd_ioctl_get_tile_config_args {
/* to KFD: pointer to tile array */
- uint64_t tile_config_ptr;
+ __u64 tile_config_ptr;
/* to KFD: pointer to macro tile array */
- uint64_t macro_tile_config_ptr;
+ __u64 macro_tile_config_ptr;
/* to KFD: array size allocated by user mode
* from KFD: array size filled by kernel
*/
- uint32_t num_tile_configs;
+ __u32 num_tile_configs;
/* to KFD: array size allocated by user mode
* from KFD: array size filled by kernel
*/
- uint32_t num_macro_tile_configs;
+ __u32 num_macro_tile_configs;
- uint32_t gpu_id; /* to KFD */
- uint32_t gb_addr_config; /* from KFD */
- uint32_t num_banks; /* from KFD */
- uint32_t num_ranks; /* from KFD */
+ __u32 gpu_id; /* to KFD */
+ __u32 gb_addr_config; /* from KFD */
+ __u32 num_banks; /* from KFD */
+ __u32 num_ranks; /* from KFD */
/* struct size can be extended later if needed
* without breaking ABI compatibility
*/
--
ldv
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors
2017-11-13 0:35 [PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors Dmitry V. Levin
@ 2017-11-13 16:11 ` Oded Gabbay
0 siblings, 0 replies; 5+ messages in thread
From: Oded Gabbay @ 2017-11-13 16:11 UTC (permalink / raw)
To: Oded Gabbay, Maling list - DRI developers,
Linux-Kernel@Vger. Kernel. Org
On Mon, Nov 13, 2017 at 2:35 AM, Dmitry V. Levin <ldv@altlinux.org> wrote:
> 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>
> ---
> include/uapi/linux/kfd_ioctl.h | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
> index 26283fefdf5f..f7015aa12347 100644
> --- a/include/uapi/linux/kfd_ioctl.h
> +++ b/include/uapi/linux/kfd_ioctl.h
> @@ -233,29 +233,29 @@ struct kfd_ioctl_wait_events_args {
> };
>
> struct kfd_ioctl_set_scratch_backing_va_args {
> - uint64_t va_addr; /* to KFD */
> - uint32_t gpu_id; /* to KFD */
> - uint32_t pad;
> + __u64 va_addr; /* to KFD */
> + __u32 gpu_id; /* to KFD */
> + __u32 pad;
> };
>
> struct kfd_ioctl_get_tile_config_args {
> /* to KFD: pointer to tile array */
> - uint64_t tile_config_ptr;
> + __u64 tile_config_ptr;
> /* to KFD: pointer to macro tile array */
> - uint64_t macro_tile_config_ptr;
> + __u64 macro_tile_config_ptr;
> /* to KFD: array size allocated by user mode
> * from KFD: array size filled by kernel
> */
> - uint32_t num_tile_configs;
> + __u32 num_tile_configs;
> /* to KFD: array size allocated by user mode
> * from KFD: array size filled by kernel
> */
> - uint32_t num_macro_tile_configs;
> + __u32 num_macro_tile_configs;
>
> - uint32_t gpu_id; /* to KFD */
> - uint32_t gb_addr_config; /* from KFD */
> - uint32_t num_banks; /* from KFD */
> - uint32_t num_ranks; /* from KFD */
> + __u32 gpu_id; /* to KFD */
> + __u32 gb_addr_config; /* from KFD */
> + __u32 num_banks; /* from KFD */
> + __u32 num_ranks; /* from KFD */
> /* struct size can be extended later if needed
> * without breaking ABI compatibility
> */
> --
> ldv
Thanks!
Applied to -fixes
Oded
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors
@ 2018-04-05 4:26 Dmitry V. Levin
2018-04-09 3:36 ` Sasha Levin
2018-04-24 9:32 ` Oded Gabbay
0 siblings, 2 replies; 5+ messages in thread
From: Dmitry V. Levin @ 2018-04-05 4:26 UTC (permalink / raw)
To: Felix Kuehling, Shaoyun.liu, Jay Cornwall, Oded Gabbay
Cc: dri-devel, linux-kernel
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:266:2: error: unknown type name 'uint64_t'
uint64_t tba_addr; /* to KFD */
/usr/include/linux/kfd_ioctl.h:267:2: error: unknown type name 'uint64_t'
uint64_t tma_addr; /* to KFD */
/usr/include/linux/kfd_ioctl.h:268:2: error: unknown type name 'uint32_t'
uint32_t gpu_id; /* to KFD */
/usr/include/linux/kfd_ioctl.h:269:2: error: unknown type name 'uint32_t'
uint32_t pad;
Fixes: d7b9bd2248d79 ("drm/amdkfd: Add support for user-mode trap handlers")
Cc: <stable@vger.kernel.org> # v4.16
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
include/uapi/linux/kfd_ioctl.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index f4cab5b3ba9a..111d73ba2d96 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -263,10 +263,10 @@ struct kfd_ioctl_get_tile_config_args {
};
struct kfd_ioctl_set_trap_handler_args {
- uint64_t tba_addr; /* to KFD */
- uint64_t tma_addr; /* to KFD */
- uint32_t gpu_id; /* to KFD */
- uint32_t pad;
+ __u64 tba_addr; /* to KFD */
+ __u64 tma_addr; /* to KFD */
+ __u32 gpu_id; /* to KFD */
+ __u32 pad;
};
#define AMDKFD_IOCTL_BASE 'K'
--
ldv
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors
2018-04-05 4:26 Dmitry V. Levin
@ 2018-04-09 3:36 ` Sasha Levin
2018-04-24 9:32 ` Oded Gabbay
1 sibling, 0 replies; 5+ messages in thread
From: Sasha Levin @ 2018-04-09 3:36 UTC (permalink / raw)
To: Sasha Levin, Dmitry V. Levin, Felix Kuehling
Cc: dri-devel, linux-kernel, stable, stable
Hi,
[This is an automated email]
This commit has been processed because it contains a "Fixes:" tag,
fixing commit: 6a1c9510694f drm/amdkfd: Adding new IOCTL for scratch memory v2.
The bot has also determined it's probably a bug fixing patch. (score: 20.4472)
The bot has tested the following trees: v4.16, v4.15.15, v4.14.32.
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors
2018-04-05 4:26 Dmitry V. Levin
2018-04-09 3:36 ` Sasha Levin
@ 2018-04-24 9:32 ` Oded Gabbay
1 sibling, 0 replies; 5+ messages in thread
From: Oded Gabbay @ 2018-04-24 9:32 UTC (permalink / raw)
To: Felix Kuehling, Shaoyun.liu, Jay Cornwall, Oded Gabbay,
Maling list - DRI developers, Linux-Kernel@Vger. Kernel. Org
Thanks, but already fixed in latest upstream tree
Oded
On Thu, Apr 5, 2018 at 7:26 AM, Dmitry V. Levin <ldv@altlinux.org> wrote:
> 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:266:2: error: unknown type name 'uint64_t'
> uint64_t tba_addr; /* to KFD */
> /usr/include/linux/kfd_ioctl.h:267:2: error: unknown type name 'uint64_t'
> uint64_t tma_addr; /* to KFD */
> /usr/include/linux/kfd_ioctl.h:268:2: error: unknown type name 'uint32_t'
> uint32_t gpu_id; /* to KFD */
> /usr/include/linux/kfd_ioctl.h:269:2: error: unknown type name 'uint32_t'
> uint32_t pad;
>
> Fixes: d7b9bd2248d79 ("drm/amdkfd: Add support for user-mode trap handlers")
> Cc: <stable@vger.kernel.org> # v4.16
> Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
> ---
> include/uapi/linux/kfd_ioctl.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
> index f4cab5b3ba9a..111d73ba2d96 100644
> --- a/include/uapi/linux/kfd_ioctl.h
> +++ b/include/uapi/linux/kfd_ioctl.h
> @@ -263,10 +263,10 @@ struct kfd_ioctl_get_tile_config_args {
> };
>
> struct kfd_ioctl_set_trap_handler_args {
> - uint64_t tba_addr; /* to KFD */
> - uint64_t tma_addr; /* to KFD */
> - uint32_t gpu_id; /* to KFD */
> - uint32_t pad;
> + __u64 tba_addr; /* to KFD */
> + __u64 tma_addr; /* to KFD */
> + __u32 gpu_id; /* to KFD */
> + __u32 pad;
> };
>
> #define AMDKFD_IOCTL_BASE 'K'
> --
> ldv
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-04-24 9:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-13 0:35 [PATCH] uapi: fix linux/kfd_ioctl.h userspace compilation errors Dmitry V. Levin
2017-11-13 16:11 ` Oded Gabbay
2018-04-05 4:26 Dmitry V. Levin
2018-04-09 3:36 ` Sasha Levin
2018-04-24 9:32 ` Oded Gabbay
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).