From 11f11a6c0d3ba9acdab21dcb4ea3f6b4c6518693 Mon Sep 17 00:00:00 2001 From: Thomas Fleury Date: Wed, 23 Mar 2016 16:49:36 -0700 Subject: gpu: nvgpu: fix zcb_count gr_gk20a_init_gr_config may be invoked several times if gr->sw_ready is reset. Need to clear zcb_count before summing gpc_zcb_count[gpc] to avoid ever incrementing count Change-Id: If3bfa47ed807a3e9a5dc31f7f7f96f0c6e1fed08 Signed-off-by: Thomas Fleury Reviewed-on: http://git-master/r/1120772 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/gpu/nvgpu/gk20a/gr_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index a8addc7b..cc3a6813 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c @@ -3242,6 +3242,7 @@ static int gr_gk20a_init_gr_config(struct gk20a *g, struct gr_gk20a *gr) gr->ppc_count = 0; gr->tpc_count = 0; + gr->zcb_count = 0; for (gpc_index = 0; gpc_index < gr->gpc_count; gpc_index++) { tmp = gk20a_readl(g, gr_gpc0_fs_gpc_r()); -- cgit v1.2.2