diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2017-11-08 09:05:41 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-10 13:30:10 -0500 |
commit | a17a938a48af462ccf89195196a13b9623af2e21 (patch) | |
tree | 0d2e8127c59ac859e286ba89121450fa5056a4ed /drivers/gpu/nvgpu/gk20a | |
parent | cefabe7eb1f1f1dba9692e21ab4f1b88b9163489 (diff) |
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 <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1594422
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.h | 4 |
2 files changed, 6 insertions, 2 deletions
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, | |||
1242 | gpfifo_size = num_entries; | 1242 | gpfifo_size = num_entries; |
1243 | gpfifo_entry_size = nvgpu_get_gpfifo_entry_size(); | 1243 | gpfifo_entry_size = nvgpu_get_gpfifo_entry_size(); |
1244 | 1244 | ||
1245 | if (flags & NVGPU_ALLOC_GPFIFO_EX_FLAGS_VPR_ENABLED) | 1245 | if (flags & NVGPU_GPFIFO_FLAGS_SUPPORT_VPR) |
1246 | c->vpr = true; | 1246 | c->vpr = true; |
1247 | 1247 | ||
1248 | if (flags & NVGPU_ALLOC_GPFIFO_EX_FLAGS_DETERMINISTIC) { | 1248 | if (flags & NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC) { |
1249 | nvgpu_rwsem_down_read(&g->deterministic_busy); | 1249 | nvgpu_rwsem_down_read(&g->deterministic_busy); |
1250 | /* | 1250 | /* |
1251 | * Railgating isn't deterministic; instead of disallowing | 1251 | * 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; | |||
48 | #include "channel_t19x.h" | 48 | #include "channel_t19x.h" |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | /* Flags to be passed to gk20a_channel_alloc_gpfifo() */ | ||
52 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_VPR (1 << 0) | ||
53 | #define NVGPU_GPFIFO_FLAGS_SUPPORT_DETERMINISTIC (1 << 1) | ||
54 | |||
51 | struct notification { | 55 | struct notification { |
52 | struct { | 56 | struct { |
53 | u32 nanoseconds[2]; | 57 | u32 nanoseconds[2]; |