nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

include: uapi: fix nvgpu.h comments and bits

Browse Source 
Correct some old comments and remove uses of the BIT macro to make it
easier to sync this file to userspace.

Change-Id: Ie897fc73e28b8194e0c5357eef7ae233395e9ba3
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/552916
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Lauri Peltonen <lpeltonen@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
Konsta Holtta
2014-10-02 17:09:15 +03:00
committed by Dan Willemsen
parent f26a620ad4
commit 17e4b7ff3f
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
include/uapi/linux/nvgpu.h
View File

@@ -24,13 +24,13 @@
#endif #endif
/* /*
* /dev/nvhost-ctrl-gr3d devices * /dev/nvhost-ctrl-gpu device
* *
* Opening a '/dev/nvhost-ctrl-gr3d' device node creates a way to send * Opening a '/dev/nvhost-ctrl-gpu' device node creates a way to send
* ctrl ioctl to gpu driver. * ctrl ioctl to gpu driver.
* *
* /dev/nvhost-gr3d is for channel (context specific) operations. We use * /dev/nvhost-gpu is for channel (context specific) operations. We use
* /dev/nvhost-ctrl-gr3d for global (context independent) operations on * /dev/nvhost-ctrl-gpu for global (context independent) operations on
* gpu device. * gpu device.
*/ */
@@ -197,7 +197,7 @@ struct nvgpu_gpu_mark_compressible_write_args {
/* /*
* /dev/nvhost-tsg-gpu devices * /dev/nvhost-tsg-gpu device
* *
* Opening a '/dev/nvhost-tsg-gpu' device node creates a way to * Opening a '/dev/nvhost-tsg-gpu' device node creates a way to
* bind/unbind a channel to/from TSG group * bind/unbind a channel to/from TSG group
@@ -221,9 +221,9 @@ struct nvgpu_gpu_mark_compressible_write_args {
#define NVGPU_TSG_IOCTL_LAST \ #define NVGPU_TSG_IOCTL_LAST \
_IOC_NR(NVGPU_IOCTL_TSG_PREEMPT) _IOC_NR(NVGPU_IOCTL_TSG_PREEMPT)
/* /*
* /dev/nvhost-dbg-* devices * /dev/nvhost-dbg-gpu device
* *
* Opening a '/dev/nvhost-dbg-<module_name>' device node creates a new debugger * Opening a '/dev/nvhost-dbg-gpu' device node creates a new debugger
* session. nvgpu channels (for the same module) can then be bound to such a * session. nvgpu channels (for the same module) can then be bound to such a
* session. * session.
* *
@@ -407,16 +407,16 @@ struct nvgpu_fence {
}; };
/* insert a wait on the fence before submitting gpfifo */ /* insert a wait on the fence before submitting gpfifo */
#define NVGPU_SUBMIT_GPFIFO_FLAGS_FENCE_WAIT BIT(0) #define NVGPU_SUBMIT_GPFIFO_FLAGS_FENCE_WAIT (1 << 0)
/* insert a fence update after submitting gpfifo and /* insert a fence update after submitting gpfifo and
return the new fence for others to wait on */ return the new fence for others to wait on */
#define NVGPU_SUBMIT_GPFIFO_FLAGS_FENCE_GET BIT(1) #define NVGPU_SUBMIT_GPFIFO_FLAGS_FENCE_GET (1 << 1)
/* choose between different gpfifo entry formats */ /* choose between different gpfifo entry formats */
#define NVGPU_SUBMIT_GPFIFO_FLAGS_HW_FORMAT BIT(2) #define NVGPU_SUBMIT_GPFIFO_FLAGS_HW_FORMAT (1 << 2)
/* interpret fence as a sync fence fd instead of raw syncpoint fence */ /* interpret fence as a sync fence fd instead of raw syncpoint fence */
#define NVGPU_SUBMIT_GPFIFO_FLAGS_SYNC_FENCE BIT(3) #define NVGPU_SUBMIT_GPFIFO_FLAGS_SYNC_FENCE (1 << 3)
/* suppress WFI before fence trigger */ /* suppress WFI before fence trigger */
#define NVGPU_SUBMIT_GPFIFO_FLAGS_SUPPRESS_WFI BIT(4) #define NVGPU_SUBMIT_GPFIFO_FLAGS_SUPPRESS_WFI (1 << 4)
struct nvgpu_submit_gpfifo_args { struct nvgpu_submit_gpfifo_args {
__u64 gpfifo; __u64 gpfifo;
@@ -428,11 +428,11 @@ struct nvgpu_submit_gpfifo_args {
struct nvgpu_map_buffer_args { struct nvgpu_map_buffer_args {
__u32 flags; __u32 flags;
#define NVGPU_MAP_BUFFER_FLAGS_ALIGN 0x0 #define NVGPU_MAP_BUFFER_FLAGS_ALIGN 0x0
#define NVGPU_MAP_BUFFER_FLAGS_OFFSET BIT(0) #define NVGPU_MAP_BUFFER_FLAGS_OFFSET (1 << 0)
#define NVGPU_MAP_BUFFER_FLAGS_KIND_PITCH 0x0 #define NVGPU_MAP_BUFFER_FLAGS_KIND_PITCH 0x0
#define NVGPU_MAP_BUFFER_FLAGS_KIND_SPECIFIED BIT(1) #define NVGPU_MAP_BUFFER_FLAGS_KIND_SPECIFIED (1 << 1)
#define NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_FALSE 0x0 #define NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_FALSE 0x0
#define NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE BIT(2) #define NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE (1 << 2)
__u32 nvmap_handle; __u32 nvmap_handle;
union { union {
__u64 offset; /* valid if _offset flag given (in|out) */ __u64 offset; /* valid if _offset flag given (in|out) */
@@ -578,9 +578,9 @@ struct nvgpu_channel_events_ctrl_args {
#define NVGPU_IOCTL_CHANNEL_MAX_ARG_SIZE sizeof(struct nvgpu_submit_gpfifo_args) #define NVGPU_IOCTL_CHANNEL_MAX_ARG_SIZE sizeof(struct nvgpu_submit_gpfifo_args)
/* /*
* /dev/nvhost-as-* devices * /dev/nvhost-as-gpu device
* *
* Opening a '/dev/nvhost-as-<module_name>' device node creates a new address * Opening a '/dev/nvhost-as-gpu' device node creates a new address
* space. nvgpu channels (for the same module) can then be bound to such an * space. nvgpu channels (for the same module) can then be bound to such an
* address space to define the addresses it has access to. * address space to define the addresses it has access to.
* *
@@ -666,8 +666,8 @@ struct nvgpu_as_bind_channel_args {
*/ */
struct nvgpu_as_map_buffer_args { struct nvgpu_as_map_buffer_args {
__u32 flags; /* in/out */ __u32 flags; /* in/out */
#define NVGPU_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET BIT(0) #define NVGPU_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET (1 << 0)
#define NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE BIT(2) #define NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE (1 << 2)
__u32 reserved; /* in */ __u32 reserved; /* in */
__u32 dmabuf_fd; /* in */ __u32 dmabuf_fd; /* in */
__u32 page_size; /* inout, 0:= best fit to buffer */ __u32 page_size; /* inout, 0:= best fit to buffer */