diff options
author | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2015-06-02 14:57:47 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-06-10 13:29:36 -0400 |
commit | 9e83f881b7fd796dd9319a6a88253e4166dbd830 (patch) | |
tree | f89fc956cb33b56e3ba1612a36b9d04e09a1effa | |
parent | 89bcbe7d315b63a62fbda706986d72cbe9588b5d (diff) |
gpu:nvgpu: correct name for unmapped ptes flags
Bug 1587825
Change-Id: I66f2988b7f1884b53bb8f3cd09ad1ead1652ffda
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/751484
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 | ||||
-rw-r--r-- | include/uapi/linux/nvgpu.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 42974154..1ab84e03 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -1168,7 +1168,7 @@ u64 gk20a_locked_gmmu_map(struct vm_gk20a *vm, | |||
1168 | flags & | 1168 | flags & |
1169 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, | 1169 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, |
1170 | flags & | 1170 | flags & |
1171 | NVGPU_GPU_FLAGS_SUPPORT_UNMAPPED_PTE, | 1171 | NVGPU_AS_MAP_BUFFER_FLAGS_UNMAPPED_PTE, |
1172 | rw_flag, | 1172 | rw_flag, |
1173 | sparse, | 1173 | sparse, |
1174 | flags); | 1174 | flags); |
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index 1367b7be..5f49c9cf 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h | |||
@@ -104,8 +104,6 @@ struct nvgpu_gpu_zbc_query_table_args { | |||
104 | #define NVGPU_GPU_FLAGS_SUPPORT_SYNC_FENCE_FDS (1 << 3) | 104 | #define NVGPU_GPU_FLAGS_SUPPORT_SYNC_FENCE_FDS (1 << 3) |
105 | /* NVGPU_IOCTL_CHANNEL_CYCLE_STATS is available */ | 105 | /* NVGPU_IOCTL_CHANNEL_CYCLE_STATS is available */ |
106 | #define NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS (1 << 4) | 106 | #define NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS (1 << 4) |
107 | /* MAP_BUFFER_EX with unmapped PTE */ | ||
108 | #define NVGPU_GPU_FLAGS_SUPPORT_UNMAPPED_PTE (1 << 5) | ||
109 | /* NVGPU_IOCTL_CHANNEL_CYCLE_STATS_SNAPSHOT is available */ | 107 | /* NVGPU_IOCTL_CHANNEL_CYCLE_STATS_SNAPSHOT is available */ |
110 | #define NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS_SNAPSHOT (1 << 6) | 108 | #define NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS_SNAPSHOT (1 << 6) |
111 | 109 | ||
@@ -884,6 +882,7 @@ struct nvgpu_as_map_buffer_args { | |||
884 | __u32 flags; /* in/out */ | 882 | __u32 flags; /* in/out */ |
885 | #define NVGPU_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET (1 << 0) | 883 | #define NVGPU_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET (1 << 0) |
886 | #define NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE (1 << 2) | 884 | #define NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE (1 << 2) |
885 | #define NVGPU_AS_MAP_BUFFER_FLAGS_UNMAPPED_PTE (1 << 5) | ||
887 | #define NVGPU_AS_MAP_BUFFER_FLAGS_MAPPABLE_COMPBITS (1 << 6) | 886 | #define NVGPU_AS_MAP_BUFFER_FLAGS_MAPPABLE_COMPBITS (1 << 6) |
888 | __u32 reserved; /* in */ | 887 | __u32 reserved; /* in */ |
889 | __u32 dmabuf_fd; /* in */ | 888 | __u32 dmabuf_fd; /* in */ |