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

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)
         gpu->on_board_video_memory_size = 0; /* integrated GPU */
 
         gpu->num_gpc = g->gr.gpc_count;
-        gpu->max_gpc_count = g->gr.gpc_count;
+        gpu->max_gpc_count = g->gr.max_gpc_count;
 
         gpu->num_tpc_per_gpc = g->gr.max_tpc_per_gpc_count;
 
@@ -2107,7 +2107,7 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
         gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_USERSPACE_MANAGED_AS;
         gpu->flags |= NVGPU_GPU_FLAGS_SUPPORT_TSG;
 
-        gpu->gpc_mask = 1;
+        gpu->gpc_mask = (1 << g->gr.gpc_count)-1;
 
         g->ops.gr.detect_sm_arch(g);