diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-05 13:25:47 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-05-06 11:36:53 -0400 |
commit | 307f7f7b55f8b099c253579b923b2b6dc9da68e5 (patch) | |
tree | ce4b9db8eb0531cc685195cf9e35423364f55055 /drivers/gpu | |
parent | 8b55a34c1d29c1275de52e7afd2dd14241707609 (diff) |
gpu: nvgpu: Report correct number of GPCs
GPU characteristics hard coded GPC mask of 1 and returned number of
enabled GPCs as maximum number of GPCs. Fix both gpc_count and
max_gpc_count to be returned correctly.
JIRA DNVGPU-6
Change-Id: I41598b2f2d2ada26b0ad433f40a51e59b14deadd
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1142185
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 4bf198a0..a17e6bc1 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -2074,7 +2074,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g) | |||
2074 | gpu->on_board_video_memory_size = 0; /* integrated GPU */ | 2074 | gpu->on_board_video_memory_size = 0; /* integrated GPU */ |
2075 | 2075 | ||
2076 | gpu->num_gpc = g->gr.gpc_count; | 2076 | gpu->num_gpc = g->gr.gpc_count; |
2077 | gpu->max_gpc_count = g->gr.gpc_count; | 2077 | gpu->max_gpc_count = g->gr.max_gpc_count; |
2078 | 2078 | ||
2079 | gpu->num_tpc_per_gpc = g->gr.max_tpc_per_gpc_count; | 2079 | gpu->num_tpc_per_gpc = g->gr.max_tpc_per_gpc_count; |
2080 | 2080 | ||
@@ -2107,7 +2107,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g) | |||
2107 | gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_USERSPACE_MANAGED_AS; | 2107 | gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_USERSPACE_MANAGED_AS; |
2108 | gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_TSG; | 2108 | gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_TSG; |
2109 | 2109 | ||
2110 | gpu->gpc_mask = 1; | 2110 | gpu->gpc_mask = (1 << g->gr.gpc_count)-1; |
2111 | 2111 | ||
2112 | g->ops.gr.detect_sm_arch(g); | 2112 | g->ops.gr.detect_sm_arch(g); |
2113 | 2113 | ||