diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index 1c74dca60..1c75d1ff1 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -441,12 +441,14 @@ int gr_gm20b_dump_gr_status_regs(struct gk20a *g,
 		gk20a_readl(g, gr_pri_gpc0_gpccs_gpc_activity3_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC0_TPCCS_TPC_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpc0_tpc0_tpccs_tpc_activity_0_r()));
-	if ((gr->config->gpc_tpc_count != NULL) && (gr->config->gpc_tpc_count[0] == 2U)) {
-		gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC1_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-			gk20a_readl(g, gr_pri_gpc0_tpc1_tpccs_tpc_activity_0_r()));
+	if ((gr->config->gpc_tpc_count != NULL) &&
+					(gr->config->gpc_tpc_count[0] == 2U)) {
+		gk20a_debug_output(o,
+			"NV_PGRAPH_PRI_GPC0_TPC1_TPCCS_TPC_ACTIVITY0: 0x%x\n",
+			gk20a_readl(g,
+			(gr_pri_gpc0_tpc0_tpccs_tpc_activity_0_r() +
+			nvgpu_get_litter_value(g, GPU_LIT_TPC_IN_GPC_STRIDE))));
 	}
-	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPCS_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-		gk20a_readl(g, gr_pri_gpc0_tpcs_tpccs_tpc_activity_0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_GPCCS_GPC_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpcs_gpccs_gpc_activity_0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_GPCCS_GPC_ACTIVITY1: 0x%x\n",
@@ -455,18 +457,13 @@ int gr_gm20b_dump_gr_status_regs(struct gk20a *g,
 		gk20a_readl(g, gr_pri_gpcs_gpccs_gpc_activity_2_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_GPCCS_GPC_ACTIVITY3: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpcs_gpccs_gpc_activity_3_r()));
-	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_TPC0_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-		gk20a_readl(g, gr_pri_gpcs_tpc0_tpccs_tpc_activity_0_r()));
-	if ((gr->config->gpc_tpc_count != NULL) && (gr->config->gpc_tpc_count[0] == 2U)) {
-		gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_TPC1_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-			gk20a_readl(g, gr_pri_gpcs_tpc1_tpccs_tpc_activity_0_r()));
-	}
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_TPCS_TPCCS_TPC_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpcs_tpcs_tpccs_tpc_activity_0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_BE0_BECS_BE_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_be0_becs_be_activity0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_BE1_BECS_BE_ACTIVITY0: 0x%x\n",
-		gk20a_readl(g, gr_pri_be1_becs_be_activity0_r()));
+		gk20a_readl(g, (gr_pri_be0_becs_be_activity0_r() +
+		nvgpu_get_litter_value(g, GPU_LIT_ROP_STRIDE))));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_BES_BECS_BE_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_bes_becs_be_activity0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_DS_MPIPE_STATUS: 0x%x\n",
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 45350b244..d1f3d1059 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -598,12 +598,14 @@ int gr_gp10b_dump_gr_status_regs(struct gk20a *g,
 		gk20a_readl(g, gr_pri_gpc0_gpccs_gpc_activity3_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC0_TPCCS_TPC_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpc0_tpc0_tpccs_tpc_activity_0_r()));
-	if ((gr->config->gpc_tpc_count != NULL) && (gr->config->gpc_tpc_count[0] == 2U)) {
-		gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC1_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-			gk20a_readl(g, gr_pri_gpc0_tpc1_tpccs_tpc_activity_0_r()));
+	if ((gr->config->gpc_tpc_count != NULL) &&
+					(gr->config->gpc_tpc_count[0] == 2U)) {
+		gk20a_debug_output(o,
+			"NV_PGRAPH_PRI_GPC0_TPC1_TPCCS_TPC_ACTIVITY0: 0x%x\n",
+			gk20a_readl(g,
+			(gr_pri_gpc0_tpc0_tpccs_tpc_activity_0_r() +
+			nvgpu_get_litter_value(g, GPU_LIT_TPC_IN_GPC_STRIDE))));
 	}
-	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPCS_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-		gk20a_readl(g, gr_pri_gpc0_tpcs_tpccs_tpc_activity_0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_GPCCS_GPC_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpcs_gpccs_gpc_activity_0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_GPCCS_GPC_ACTIVITY1: 0x%x\n",
@@ -612,18 +614,13 @@ int gr_gp10b_dump_gr_status_regs(struct gk20a *g,
 		gk20a_readl(g, gr_pri_gpcs_gpccs_gpc_activity_2_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_GPCCS_GPC_ACTIVITY3: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpcs_gpccs_gpc_activity_3_r()));
-	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_TPC0_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-		gk20a_readl(g, gr_pri_gpcs_tpc0_tpccs_tpc_activity_0_r()));
-	if ((gr->config->gpc_tpc_count != NULL) && (gr->config->gpc_tpc_count[0] == 2U)) {
-		gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_TPC1_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-			gk20a_readl(g, gr_pri_gpcs_tpc1_tpccs_tpc_activity_0_r()));
-	}
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_TPCS_TPCCS_TPC_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpcs_tpcs_tpccs_tpc_activity_0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_BE0_BECS_BE_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_be0_becs_be_activity0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_BE1_BECS_BE_ACTIVITY0: 0x%x\n",
-		gk20a_readl(g, gr_pri_be1_becs_be_activity0_r()));
+		gk20a_readl(g, (gr_pri_be0_becs_be_activity0_r() +
+		nvgpu_get_litter_value(g, GPU_LIT_ROP_STRIDE))));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_BES_BECS_BE_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_bes_becs_be_activity0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_DS_MPIPE_STATUS: 0x%x\n",
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index 940531c90..e940aaa71 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -1161,12 +1161,14 @@ int gr_gv11b_dump_gr_status_regs(struct gk20a *g,
 		gk20a_readl(g, gr_pri_gpc0_gpccs_gpc_activity3_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC0_TPCCS_TPC_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpc0_tpc0_tpccs_tpc_activity_0_r()));
-	if ((gr->config->gpc_tpc_count != NULL) && (gr->config->gpc_tpc_count[0] == 2U)) {
-		gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPC1_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-			gk20a_readl(g, gr_pri_gpc0_tpc1_tpccs_tpc_activity_0_r()));
+	if ((gr->config->gpc_tpc_count != NULL) &&
+					(gr->config->gpc_tpc_count[0] == 2U)) {
+		gk20a_debug_output(o,
+			"NV_PGRAPH_PRI_GPC0_TPC1_TPCCS_TPC_ACTIVITY0: 0x%x\n",
+			gk20a_readl(g,
+			(gr_pri_gpc0_tpc0_tpccs_tpc_activity_0_r() +
+			nvgpu_get_litter_value(g, GPU_LIT_TPC_IN_GPC_STRIDE))));
 	}
-	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPC0_TPCS_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-		gk20a_readl(g, gr_pri_gpc0_tpcs_tpccs_tpc_activity_0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_GPCCS_GPC_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpcs_gpccs_gpc_activity_0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_GPCCS_GPC_ACTIVITY1: 0x%x\n",
@@ -1175,18 +1177,13 @@ int gr_gv11b_dump_gr_status_regs(struct gk20a *g,
 		gk20a_readl(g, gr_pri_gpcs_gpccs_gpc_activity_2_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_GPCCS_GPC_ACTIVITY3: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpcs_gpccs_gpc_activity_3_r()));
-	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_TPC0_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-		gk20a_readl(g, gr_pri_gpcs_tpc0_tpccs_tpc_activity_0_r()));
-	if ((gr->config->gpc_tpc_count != NULL) && (gr->config->gpc_tpc_count[0] == 2U)) {
-		gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_TPC1_TPCCS_TPC_ACTIVITY0: 0x%x\n",
-			gk20a_readl(g, gr_pri_gpcs_tpc1_tpccs_tpc_activity_0_r()));
-	}
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_GPCS_TPCS_TPCCS_TPC_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_gpcs_tpcs_tpccs_tpc_activity_0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_BE0_BECS_BE_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_be0_becs_be_activity0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_BE1_BECS_BE_ACTIVITY0: 0x%x\n",
-		gk20a_readl(g, gr_pri_be1_becs_be_activity0_r()));
+		gk20a_readl(g, (gr_pri_be0_becs_be_activity0_r() +
+		nvgpu_get_litter_value(g, GPU_LIT_ROP_STRIDE))));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_BES_BECS_BE_ACTIVITY0: 0x%x\n",
 		gk20a_readl(g, gr_pri_bes_becs_be_activity0_r()));
 	gk20a_debug_output(o, "NV_PGRAPH_PRI_DS_MPIPE_STATUS: 0x%x\n",
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h
index 309274329..2ec96c8f4 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h
@@ -434,14 +434,6 @@ static inline u32 gr_pri_gpc0_tpc0_tpccs_tpc_activity_0_r(void)
 {
 	return 0x00504500U;
 }
-static inline u32 gr_pri_gpc0_tpc1_tpccs_tpc_activity_0_r(void)
-{
-	return 0x00504d00U;
-}
-static inline u32 gr_pri_gpc0_tpcs_tpccs_tpc_activity_0_r(void)
-{
-	return 0x00501d00U;
-}
 static inline u32 gr_pri_gpcs_gpccs_gpc_activity_0_r(void)
 {
 	return 0x0041ac80U;
@@ -458,14 +450,6 @@ static inline u32 gr_pri_gpcs_gpccs_gpc_activity_3_r(void)
 {
 	return 0x0041ac8cU;
 }
-static inline u32 gr_pri_gpcs_tpc0_tpccs_tpc_activity_0_r(void)
-{
-	return 0x0041c500U;
-}
-static inline u32 gr_pri_gpcs_tpc1_tpccs_tpc_activity_0_r(void)
-{
-	return 0x0041cd00U;
-}
 static inline u32 gr_pri_gpcs_tpcs_tpccs_tpc_activity_0_r(void)
 {
 	return 0x00419d00U;
@@ -474,10 +458,6 @@ static inline u32 gr_pri_be0_becs_be_activity0_r(void)
 {
 	return 0x00410200U;
 }
-static inline u32 gr_pri_be1_becs_be_activity0_r(void)
-{
-	return 0x00410600U;
-}
 static inline u32 gr_pri_bes_becs_be_activity0_r(void)
 {
 	return 0x00408a00U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
index 801f72a35..380dc4d30 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
@@ -458,14 +458,6 @@ static inline u32 gr_pri_gpc0_tpc0_tpccs_tpc_activity_0_r(void)
 {
 	return 0x00504500U;
 }
-static inline u32 gr_pri_gpc0_tpc1_tpccs_tpc_activity_0_r(void)
-{
-	return 0x00504d00U;
-}
-static inline u32 gr_pri_gpc0_tpcs_tpccs_tpc_activity_0_r(void)
-{
-	return 0x00501d00U;
-}
 static inline u32 gr_pri_gpcs_gpccs_gpc_activity_0_r(void)
 {
 	return 0x0041ac80U;
@@ -482,14 +474,6 @@ static inline u32 gr_pri_gpcs_gpccs_gpc_activity_3_r(void)
 {
 	return 0x0041ac8cU;
 }
-static inline u32 gr_pri_gpcs_tpc0_tpccs_tpc_activity_0_r(void)
-{
-	return 0x0041c500U;
-}
-static inline u32 gr_pri_gpcs_tpc1_tpccs_tpc_activity_0_r(void)
-{
-	return 0x0041cd00U;
-}
 static inline u32 gr_pri_gpcs_tpcs_tpccs_tpc_activity_0_r(void)
 {
 	return 0x00419d00U;
@@ -498,10 +482,6 @@ static inline u32 gr_pri_be0_becs_be_activity0_r(void)
 {
 	return 0x00410200U;
 }
-static inline u32 gr_pri_be1_becs_be_activity0_r(void)
-{
-	return 0x00410600U;
-}
 static inline u32 gr_pri_bes_becs_be_activity0_r(void)
 {
 	return 0x00408a00U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
index 574c59bbd..8ff9e7e10 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_gr_gv11b.h
@@ -526,14 +526,6 @@ static inline u32 gr_pri_gpc0_tpc0_tpccs_tpc_activity_0_r(void)
 {
 	return 0x00504500U;
 }
-static inline u32 gr_pri_gpc0_tpc1_tpccs_tpc_activity_0_r(void)
-{
-	return 0x00504d00U;
-}
-static inline u32 gr_pri_gpc0_tpcs_tpccs_tpc_activity_0_r(void)
-{
-	return 0x00501d00U;
-}
 static inline u32 gr_pri_gpcs_gpccs_gpc_activity_0_r(void)
 {
 	return 0x0041ac80U;
@@ -550,14 +542,6 @@ static inline u32 gr_pri_gpcs_gpccs_gpc_activity_3_r(void)
 {
 	return 0x0041ac8cU;
 }
-static inline u32 gr_pri_gpcs_tpc0_tpccs_tpc_activity_0_r(void)
-{
-	return 0x0041c500U;
-}
-static inline u32 gr_pri_gpcs_tpc1_tpccs_tpc_activity_0_r(void)
-{
-	return 0x0041cd00U;
-}
 static inline u32 gr_pri_gpcs_tpcs_tpccs_tpc_activity_0_r(void)
 {
 	return 0x00419d00U;
@@ -566,10 +550,6 @@ static inline u32 gr_pri_be0_becs_be_activity0_r(void)
 {
 	return 0x00410200U;
 }
-static inline u32 gr_pri_be1_becs_be_activity0_r(void)
-{
-	return 0x00410600U;
-}
 static inline u32 gr_pri_bes_becs_be_activity0_r(void)
 {
 	return 0x00408a00U;