diff --git a/drivers/gpu/msm/adreno_a6xx_snapshot.c b/drivers/gpu/msm/adreno_a6xx_snapshot.c
index e59f7430b09d..9408cfcf0f97 100644
--- a/drivers/gpu/msm/adreno_a6xx_snapshot.c
+++ b/drivers/gpu/msm/adreno_a6xx_snapshot.c
@@ -117,10 +117,6 @@ static const unsigned int a6xx_hlsq_duplicate_cluster[] = {
 	0xBB10, 0xBB11, 0xBB20, 0xBB29,
 };
 
-static const unsigned int a6xx_hlsq_2d_duplicate_cluster[] = {
-	0xBD80, 0xBD80,
-};
-
 static const unsigned int a6xx_sp_duplicate_cluster[] = {
 	0xAB00, 0xAB00, 0xAB04, 0xAB05, 0xAB10, 0xAB1B, 0xAB20, 0xAB20,
 };
@@ -134,10 +130,6 @@ static const unsigned int a6xx_sp_ps_hlsq_cluster[] = {
 	0xB9C0, 0xB9C9,
 };
 
-static const unsigned int a6xx_sp_ps_hlsq_2d_cluster[] = {
-	0xBD80, 0xBD80,
-};
-
 static const unsigned int a6xx_sp_ps_sp_cluster[] = {
 	0xA980, 0xA9A8, 0xA9B0, 0xA9BC, 0xA9D0, 0xA9D3, 0xA9E0, 0xA9F3,
 	0xAA00, 0xAA00, 0xAA30, 0xAA31, 0xAAF2, 0xAAF2,
@@ -170,16 +162,12 @@ static struct a6xx_cluster_dbgahb_registers {
 		ARRAY_SIZE(a6xx_sp_vs_sp_cluster) / 2 },
 	{ CP_CLUSTER_SP_VS, 0x0002E000, 0x41, a6xx_hlsq_duplicate_cluster,
 		ARRAY_SIZE(a6xx_hlsq_duplicate_cluster) / 2 },
-	{ CP_CLUSTER_SP_VS, 0x0002F000, 0x45, a6xx_hlsq_2d_duplicate_cluster,
-		ARRAY_SIZE(a6xx_hlsq_2d_duplicate_cluster) / 2 },
 	{ CP_CLUSTER_SP_VS, 0x0002A000, 0x21, a6xx_sp_duplicate_cluster,
 		ARRAY_SIZE(a6xx_sp_duplicate_cluster) / 2 },
 	{ CP_CLUSTER_SP_VS, 0x0002C000, 0x1, a6xx_tp_duplicate_cluster,
 		ARRAY_SIZE(a6xx_tp_duplicate_cluster) / 2 },
 	{ CP_CLUSTER_SP_PS, 0x0002E000, 0x42, a6xx_sp_ps_hlsq_cluster,
 		ARRAY_SIZE(a6xx_sp_ps_hlsq_cluster) / 2 },
-	{ CP_CLUSTER_SP_PS, 0x0002F000, 0x46, a6xx_sp_ps_hlsq_2d_cluster,
-		ARRAY_SIZE(a6xx_sp_ps_hlsq_2d_cluster) / 2 },
 	{ CP_CLUSTER_SP_PS, 0x0002A000, 0x22, a6xx_sp_ps_sp_cluster,
 		ARRAY_SIZE(a6xx_sp_ps_sp_cluster) / 2 },
 	{ CP_CLUSTER_SP_PS, 0x0002B000, 0x26, a6xx_sp_ps_sp_2d_cluster,
@@ -515,7 +503,10 @@ enum a6xx_shader_obj {
 	A6XX_HLSQ_DATAPATH_META         = 0x60,
 	A6XX_HLSQ_FRONTEND_META         = 0x61,
 	A6XX_HLSQ_INDIRECT_META         = 0x62,
-	A6XX_HLSQ_BACKEND_META          = 0x63
+	A6XX_HLSQ_BACKEND_META          = 0x63,
+	A6XX_SP_LB_6_DATA               = 0x70,
+	A6XX_SP_LB_7_DATA               = 0x71,
+	A6XX_HLSQ_INST_RAM_1            = 0x73,
 };
 
 struct a6xx_shader_block {
@@ -570,7 +561,10 @@ static struct a6xx_shader_block a6xx_shader_blocks[] = {
 	{A6XX_HLSQ_PWR_REST_TAG,          0x14},
 	{A6XX_HLSQ_DATAPATH_META,         0x40,},
 	{A6XX_HLSQ_FRONTEND_META,         0x40},
-	{A6XX_HLSQ_INDIRECT_META,         0x40,}
+	{A6XX_HLSQ_INDIRECT_META,         0x40,},
+	{A6XX_SP_LB_6_DATA,               0x200},
+	{A6XX_SP_LB_7_DATA,               0x200},
+	{A6XX_HLSQ_INST_RAM_1,            0x200},
 };
 
 static struct kgsl_memdesc *a6xx_capturescript;