diff --git a/drivers/gpu/msm/adreno_a6xx.c b/drivers/gpu/msm/adreno_a6xx.c
index 8b47a5006249..8bdca4ce1ba7 100644
--- a/drivers/gpu/msm/adreno_a6xx.c
+++ b/drivers/gpu/msm/adreno_a6xx.c
@@ -652,6 +652,13 @@ void a6xx_start(struct adreno_device *adreno_dev)
 		break;
 	}
 
+	/*
+	 * For macrotiling change on a680,  will affect RB, SP and TP
+	 * 0 means UBWC 3.0, 1 means UBWC 3.1
+	 */
+	if (adreno_is_a680(adreno_dev))
+		kgsl_regwrite(device, A6XX_RBBM_NC_MODE_CNTL, 1);
+
 	if (!WARN_ON(!adreno_dev->highest_bank_bit)) {
 		hbb_lo = (adreno_dev->highest_bank_bit - 13) & 3;
 		hbb_hi = ((adreno_dev->highest_bank_bit - 13) >> 2) & 1;