From e49d93a960f8995affeb4541941eb7f16d04eafd Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 11 Oct 2017 14:58:57 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1583876 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/fecs_trace_vgpu.c | 4 ++-- drivers/gpu/nvgpu/vgpu/vgpu.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu') 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 @@ #include #include +#include #include "gk20a/gk20a.h" #include "gk20a/ctxsw_trace_gk20a.h" @@ -63,8 +64,7 @@ int vgpu_fecs_trace_init(struct gk20a *g) dev_info(dev_from_gk20a(g), "does not support fecs trace\n"); goto fail; } - g->gpu_characteristics.flags |= - NVGPU_GPU_FLAGS_SUPPORT_FECS_CTXSW_TRACE; + __nvgpu_set_enabled(g, NVGPU_SUPPORT_FECS_CTXSW_TRACE, true); hv_np = args.np; 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) g->gpu_characteristics.map_buffer_batch_limit = 0; /* features vgpu does not support */ - g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_CYCLE_STATS; - g->gpu_characteristics.flags &= ~NVGPU_GPU_FLAGS_SUPPORT_MAP_COMPBITS; - g->gpu_characteristics.flags &= - ~NVGPU_GPU_FLAGS_SUPPORT_RESCHEDULE_RUNLIST; + __nvgpu_set_enabled(g, NVGPU_SUPPORT_CYCLE_STATS, false); + __nvgpu_set_enabled(g, NVGPU_SUPPORT_RESCHEDULE_RUNLIST, false); return 0; } -- cgit v1.2.2