From a17a938a48af462ccf89195196a13b9623af2e21 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Wed, 8 Nov 2017 06:05:41 -0800 Subject: gpu: nvgpu: remove NVGPU_ALLOC_GPFIFO_EX_FLAGS_* from common code In gk20a_channel_alloc_gpfifo(), we use linux specific flags NVGPU_ALLOC_GPFIFO_EX_FLAGS_* Since common code should be independent of linux specific code, define new flags NVGPU_GPFIFO_FLAGS_SUPPORT_* in common code and use them in gk20a_channel_alloc_gpfifo() Linux code will parse the user flags and send appropriate flags to gk20a_channel_alloc_gpfifo() Jira NVGPU-381 Change-Id: Ibec51903b3407175fbba727208483b0dc36a5772 Signed-off-by: Deepak Nibade Reviewed-on: https://git-master.nvidia.com/r/1594422 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 4 ++-- drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 229e3782..9a8130ba 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c @@ -1242,10 +1242,10 @@ int gk20a_channel_alloc_gpfifo(struct channel_gk20a *c, gpfifo_size = num_entries; gpfifo_entry_size = nvgpu_get_gpfifo_entry_size(); - if (flags & NVGPU_ALLOC_GPFIFO_EX_FLAGS_VPR_ENABLED) + if (flags & NVGPU_GPFIFO_FLAGS_SUPPORT_VPR) c->vpr = true; - if (flags & NVGPU_ALLOC_GPFIFO_EX_FLAGS_DETERMINISTIC) { + if (flags & NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC) { nvgpu_rwsem_down_read(&g->deterministic_busy); /* * Railgating isn't deterministic; instead of disallowing diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h index 0cb60200..58a8aa97 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.h @@ -48,6 +48,10 @@ struct fifo_profile_gk20a; #include "channel_t19x.h" #endif +/* Flags to be passed to gk20a_channel_alloc_gpfifo() */ +#define NVGPU_GPFIFO_FLAGS_SUPPORT_VPR (1 << 0) +#define NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC (1 << 1) + struct notification { struct { u32 nanoseconds[2]; -- cgit v1.2.2