From 9e83f881b7fd796dd9319a6a88253e4166dbd830 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Tue, 2 Jun 2015 11:57:47 -0700 Subject: [PATCH] gpu:nvgpu: correct name for unmapped ptes flags Bug 1587825 Change-Id: I66f2988b7f1884b53bb8f3cd09ad1ead1652ffda Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/751484 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 +- 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 429741549..1ab84e038 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, flags & NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, flags & - NVGPU_GPU_FLAGS_SUPPORT_UNMAPPED_PTE, + NVGPU_AS_MAP_BUFFER_FLAGS_UNMAPPED_PTE, rw_flag, sparse, flags); diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h index 1367b7bef..5f49c9cf4 100644 --- a/include/uapi/linux/nvgpu.h +++ b/include/uapi/linux/nvgpu.h @@ -104,8 +104,6 @@ struct nvgpu_gpu_zbc_query_table_args { #define NVGPU_GPU_FLAGS_SUPPORT_SYNC_FENCE_FDS (1 << 3) /* NVGPU_IOCTL_CHANNEL_CYCLE_STATS is available */ #define NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS (1 << 4) -/* MAP_BUFFER_EX with unmapped PTE */ -#define NVGPU_GPU_FLAGS_SUPPORT_UNMAPPED_PTE (1 << 5) /* NVGPU_IOCTL_CHANNEL_CYCLE_STATS_SNAPSHOT is available */ #define NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS_SNAPSHOT (1 << 6) @@ -884,6 +882,7 @@ struct nvgpu_as_map_buffer_args { __u32 flags; /* in/out */ #define NVGPU_AS_MAP_BUFFER_FLAGS_FIXED_OFFSET (1 << 0) #define NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE (1 << 2) +#define NVGPU_AS_MAP_BUFFER_FLAGS_UNMAPPED_PTE (1 << 5) #define NVGPU_AS_MAP_BUFFER_FLAGS_MAPPABLE_COMPBITS (1 << 6) __u32 reserved; /* in */ __u32 dmabuf_fd; /* in */