summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Zhao <rizhao@nvidia.com>2017-03-02 14:00:17 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-03-08 14:35:24 -0500
commitbc47d822298b9f3b2f93a384a7780a3763fee495 (patch)
treebbc8192bb47b9dd76b37f6149fe5d43efb6c0cb7
parentbaf464779e4605d66e2f5eda3aff8ec33f5d093f (diff)
gpu: nvgpu: add NVGPU_GPU_FLAGS_SUPPORT_MAP_COMPBITS
native gpu driver supports map compbits but vgpu does not. Bug 1778448 Bug 200275051 JIRA VFND-3513 Change-Id: I433a6f8631b495875ba899af9609203ab36187ef Signed-off-by: Richard Zhao <rizhao@nvidia.com> Reviewed-on: http://git-master/r/1314065 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/gk20a/gk20a.c1
-rw-r--r--drivers/gpu/nvgpu/vgpu/vgpu.c1
-rw-r--r--include/uapi/linux/nvgpu.h2
3 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 583e77b4..d07918b0 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -2165,6 +2165,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
2165 2165
2166 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_USERSPACE_MANAGED_AS; 2166 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_USERSPACE_MANAGED_AS;
2167 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_TSG; 2167 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_TSG;
2168 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_MAP_COMPBITS;
2168 2169
2169 if (g->ops.clk_arb.get_arbiter_clk_domains) 2170 if (g->ops.clk_arb.get_arbiter_clk_domains)
2170 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_CLOCK_CONTROLS; 2171 gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_CLOCK_CONTROLS;
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c
index d2afc4af..d5eb05ac 100644
--- a/drivers/gpu/nvgpu/vgpu/vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/vgpu.c
@@ -317,6 +317,7 @@ static int vgpu_init_gpu_characteristics(struct gk20a *g)
317 317
318 /* features vgpu does not support */ 318 /* features vgpu does not support */
319 g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS; 319 g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS;
320 g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_MAP_COMPBITS;
320 321
321 return 0; 322 return 0;
322} 323}
diff --git a/include/uapi/linux/nvgpu.h b/include/uapi/linux/nvgpu.h
index 3f358558..400d430b 100644
--- a/include/uapi/linux/nvgpu.h
+++ b/include/uapi/linux/nvgpu.h
@@ -135,6 +135,8 @@ struct nvgpu_gpu_zbc_query_table_args {
135#define NVGPU_GPU_FLAGS_SUPPORT_DEVICE_EVENTS (1ULL << 15) 135#define NVGPU_GPU_FLAGS_SUPPORT_DEVICE_EVENTS (1ULL << 15)
136/* FECS context switch tracing is available */ 136/* FECS context switch tracing is available */
137#define NVGPU_GPU_FLAGS_SUPPORT_FECS_CTXSW_TRACE (1ULL << 16) 137#define NVGPU_GPU_FLAGS_SUPPORT_FECS_CTXSW_TRACE (1ULL << 16)
138/* NVGPU_AS_IOCTL_MAP_BUFFER_COMPBITS is available */
139#define NVGPU_GPU_FLAGS_SUPPORT_MAP_COMPBITS (1ULL << 17)
138 140
139struct nvgpu_gpu_characteristics { 141struct nvgpu_gpu_characteristics {
140 __u32 arch; 142 __u32 arch;