diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-10-11 17:58:57 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-10-26 17:35:38 -0400 |
commit | e49d93a960f8995affeb4541941eb7f16d04eafd (patch) | |
tree | 7b5eb1365bfee8a237ddf7d8e0b02959e50f5704 /drivers/gpu/nvgpu/vgpu | |
parent | 9eebb7831facaa16b2975f50a716d2986c67b699 (diff) |
gpu: nvgpu: Linux specific GPU characteristics flags
Make GPU characteristics flags specific to Linux code only. The
rest of driver is moved to using nvgpu_is_enabled() API.
JIRA NVGPU-259
Change-Id: I2faf46ef64c964361c267887b28c9d19806d6d51
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1583876
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c index 762cc10a..72f2ae8b 100644 --- a/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | #include <nvgpu/kmem.h> | 27 | #include <nvgpu/kmem.h> |
28 | #include <nvgpu/bug.h> | 28 | #include <nvgpu/bug.h> |
29 | #include <nvgpu/enabled.h> | ||
29 | 30 | ||
30 | #include "gk20a/gk20a.h" | 31 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/ctxsw_trace_gk20a.h" | 32 | #include "gk20a/ctxsw_trace_gk20a.h" |
@@ -63,8 +64,7 @@ int vgpu_fecs_trace_init(struct gk20a *g) | |||
63 | dev_info(dev_from_gk20a(g), "does not support fecs trace\n"); | 64 | dev_info(dev_from_gk20a(g), "does not support fecs trace\n"); |
64 | goto fail; | 65 | goto fail; |
65 | } | 66 | } |
66 | g->gpu_characteristics.flags |= | 67 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_FECS_CTXSW_TRACE, true); |
67 | NVGPU_GPU_FLAGS_SUPPORT_FECS_CTXSW_TRACE; | ||
68 | 68 | ||
69 | hv_np = args.np; | 69 | hv_np = args.np; |
70 | mempool = args.args[0]; | 70 | mempool = args.args[0]; |
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 84034b38..f0f05637 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -370,10 +370,8 @@ int vgpu_init_gpu_characteristics(struct gk20a *g) | |||
370 | g->gpu_characteristics.map_buffer_batch_limit = 0; | 370 | g->gpu_characteristics.map_buffer_batch_limit = 0; |
371 | 371 | ||
372 | /* features vgpu does not support */ | 372 | /* features vgpu does not support */ |
373 | g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS; | 373 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_CYCLE_STATS, false); |
374 | g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_MAP_COMPBITS; | 374 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_RESCHEDULE_RUNLIST, false); |
375 | g->gpu_characteristics.flags &= | ||
376 | ~NVGPU_GPU_FLAGS_SUPPORT_RESCHEDULE_RUNLIST; | ||
377 | 375 | ||
378 | return 0; | 376 | return 0; |
379 | } | 377 | } |