diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index c2a8d6ce0..e3b377471 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -244,7 +244,8 @@ struct gpu_ops {
 			u32 addr, int *addr_type,
 			u32 *gpc_num, u32 *tpc_num, u32 *broadcast_flags);
 		void (*egpc_etpc_priv_addr_table)(struct gk20a *g, u32 addr,
-			u32 gpc, u32 broadcast_flags, u32 *priv_addr_table,
+			u32 gpc, u32 tpc, u32 broadcast_flags,
+			u32 *priv_addr_table,
 			u32 *priv_addr_table_index);
 		bool (*is_tpc_addr)(struct gk20a *g, u32 addr);
 		bool (*is_egpc_addr)(struct gk20a *g, u32 addr);
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index e4344b9fa..96bc72af9 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -6421,7 +6421,7 @@ int gr_gk20a_create_priv_addr_table(struct gk20a *g,
 			(addr_type == CTXSW_ADDR_TYPE_ETPC)) &&
 				g->ops.gr.egpc_etpc_priv_addr_table) {
 		gk20a_dbg(gpu_dbg_gpu_dbg, "addr_type : EGPC/ETPC");
-		g->ops.gr.egpc_etpc_priv_addr_table(g, addr, gpc_num,
+		g->ops.gr.egpc_etpc_priv_addr_table(g, addr, gpc_num, tpc_num,
 				broadcast_flags, priv_addr_table, &t);
 	} else if (broadcast_flags & PRI_BROADCAST_FLAGS_LTSS) {
 		g->ops.gr.split_lts_broadcast_addr(g, addr,
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index f8461f9d7..dfb14db76 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -4018,9 +4018,9 @@ static void gv11b_gr_update_priv_addr_table_smpc(struct gk20a *g, u32 gpc_num,
 }
 
 void gv11b_gr_egpc_etpc_priv_addr_table(struct gk20a *g, u32 addr,
-		 u32 gpc, u32 broadcast_flags, u32 *priv_addr_table, u32 *t)
+	u32 gpc_num, u32 tpc_num, u32 broadcast_flags,
+	u32 *priv_addr_table, u32 *t)
 {
-	u32 gpc_num, tpc_num;
 	u32 priv_addr, gpc_addr;
 
 	nvgpu_log_info(g, "addr=0x%x", addr);
@@ -4055,7 +4055,6 @@ void gv11b_gr_egpc_etpc_priv_addr_table(struct gk20a *g, u32 addr,
 					}
 				}
 			} else if (broadcast_flags & PRI_BROADCAST_FLAGS_SMPC) {
-				tpc_num = 0;
 				gv11b_gr_update_priv_addr_table_smpc(
 					g, gpc_num, tpc_num, addr,
 					priv_addr_table, t);
@@ -4078,9 +4077,8 @@ void gv11b_gr_egpc_etpc_priv_addr_table(struct gk20a *g, u32 addr,
 	} else if (!(broadcast_flags & PRI_BROADCAST_FLAGS_EGPC)) {
 		if (broadcast_flags & PRI_BROADCAST_FLAGS_ETPC) {
 			nvgpu_log_info(g, "broadcast flags etpc but not egpc");
-			gpc_num = 0;
 			for (tpc_num = 0;
-			     tpc_num < g->gr.gpc_tpc_count[gpc];
+			     tpc_num < g->gr.gpc_tpc_count[gpc_num];
 			     tpc_num++) {
 				if (broadcast_flags &
 						PRI_BROADCAST_FLAGS_SMPC)
@@ -4091,7 +4089,7 @@ void gv11b_gr_egpc_etpc_priv_addr_table(struct gk20a *g, u32 addr,
 					priv_addr_table[*t] =
 					pri_etpc_addr(g,
 					pri_tpccs_addr_mask(addr),
-					     gpc, tpc_num);
+					     gpc_num, tpc_num);
 					nvgpu_log_info(g,
 					"priv_addr_table[%d]:%#08x",
 					*t, priv_addr_table[*t]);
@@ -4099,8 +4097,6 @@ void gv11b_gr_egpc_etpc_priv_addr_table(struct gk20a *g, u32 addr,
 				}
 			}
 		} else if (broadcast_flags & PRI_BROADCAST_FLAGS_SMPC) {
-			tpc_num = 0;
-			gpc_num = 0;
 			gv11b_gr_update_priv_addr_table_smpc(
 				g, gpc_num, tpc_num, addr,
 				priv_addr_table, t);
@@ -4666,7 +4662,7 @@ int gr_gv11b_create_priv_addr_table(struct gk20a *g,
 			(addr_type == CTXSW_ADDR_TYPE_ETPC)) &&
 				g->ops.gr.egpc_etpc_priv_addr_table) {
 		gk20a_dbg(gpu_dbg_gpu_dbg, "addr_type : EGPC/ETPC");
-		g->ops.gr.egpc_etpc_priv_addr_table(g, addr, gpc_num,
+		g->ops.gr.egpc_etpc_priv_addr_table(g, addr, gpc_num, tpc_num,
 				broadcast_flags, priv_addr_table, &t);
 	} else if (broadcast_flags & PRI_BROADCAST_FLAGS_LTSS) {
 		g->ops.gr.split_lts_broadcast_addr(g, addr,
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
index 1a3a851ec..398731a42 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.h
@@ -214,7 +214,7 @@ void gv11b_gr_get_egpc_etpc_num(struct gk20a *g, u32 addr,
 int gv11b_gr_decode_egpc_addr(struct gk20a *g, u32 addr, int *addr_type,
 	u32 *gpc_num, u32 *tpc_num, u32 *broadcast_flags);
 void gv11b_gr_egpc_etpc_priv_addr_table(struct gk20a *g, u32 addr,
-		 u32 gpc, u32 broadcast_flags, u32 *priv_addr_table, u32 *t);
+	 u32 gpc, u32 tpc, u32 broadcast_flags, u32 *priv_addr_table, u32 *t);
 u32 gv11b_gr_get_egpc_base(struct gk20a *g);
 void gr_gv11b_init_gpc_mmu(struct gk20a *g);
 int gr_gv11b_init_preemption_state(struct gk20a *g);