diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-11-07 14:01:26 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-13 13:56:54 -0500 |
commit | 8e611fb654e3f13258cd481cfd33d35d8d0fb8bb (patch) | |
tree | de5ed1ab307e98e4dd917a34b9e9bd75dddab96e /drivers/gpu/nvgpu/gk20a/gk20a.c | |
parent | e728fbecba0389c084bd52f6f6500d66982427fb (diff) |
gpu: nvgpu: Hard code map_buffer_batch_limit
Add a hard coded #define for map_buffer_batch_limit and use that
insted of querying from GPU characteristics. Also add an
nvgpu_is_enabled() flag for disabling batch mapping, and set
map_buffer_batch_limit to zero if batch mapping is disabled.
JIRA NVGPU-388
Change-Id: Ic91feea638d0f47c5c22321886cfc75e97259dc3
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1593690
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 2d7266ce..1d594d29 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -397,6 +397,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g) | |||
397 | 397 | ||
398 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_PARTIAL_MAPPINGS, true); | 398 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_PARTIAL_MAPPINGS, true); |
399 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_MAP_DIRECT_KIND_CTRL, true); | 399 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_MAP_DIRECT_KIND_CTRL, true); |
400 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_MAP_BUFFER_BATCH, true); | ||
400 | 401 | ||
401 | if (IS_ENABLED(CONFIG_SYNC)) | 402 | if (IS_ENABLED(CONFIG_SYNC)) |
402 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_SYNC_FENCE_FDS, true); | 403 | __nvgpu_set_enabled(g, NVGPU_SUPPORT_SYNC_FENCE_FDS, true); |
@@ -464,8 +465,6 @@ int gk20a_init_gpu_characteristics(struct gk20a *g) | |||
464 | gpu->cbc_cache_line_size = g->gr.cacheline_size; | 465 | gpu->cbc_cache_line_size = g->gr.cacheline_size; |
465 | gpu->cbc_comptags_per_line = g->gr.comptags_per_cacheline; | 466 | gpu->cbc_comptags_per_line = g->gr.comptags_per_cacheline; |
466 | 467 | ||
467 | gpu->map_buffer_batch_limit = 256; | ||
468 | |||
469 | if (g->ops.clk.get_maxrate) | 468 | if (g->ops.clk.get_maxrate) |
470 | gpu->max_freq = g->ops.clk.get_maxrate(&g->clk); | 469 | gpu->max_freq = g->ops.clk.get_maxrate(&g->clk); |
471 | 470 | ||