From 16492fb2661189266e9ec9ca118b52c7a18e1d93 Mon Sep 17 00:00:00 2001
From: Pankaj Gupta <gpankaj@codeaurora.org>
Date: Fri, 14 Aug 2020 20:35:05 +0530
Subject: [PATCH] msm: kgsl: Fix GBIF Halt ack timeout for a619_holi

For a619_holi GPU, use RBBM_GBIF_HALT registers to halt GX
traffic and poll for the ack.

Change-Id: Iaae9084a04a5acc05ae5561d0a3c44da0ab5cebb
Signed-off-by: Pankaj Gupta <gpankaj@codeaurora.org>
---
 drivers/gpu/msm/adreno.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 3a5f8a08cb64..6aa084f9b1da 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -1639,7 +1639,8 @@ int adreno_clear_pending_transactions(struct kgsl_device *device)
 	if (adreno_has_gbif(adreno_dev)) {
 
 		/* Halt GBIF GX traffic and poll for halt ack */
-		if (adreno_is_a615_family(adreno_dev)) {
+		if (adreno_is_a615_family(adreno_dev) &&
+			!adreno_is_a619_holi(adreno_dev)) {
 			adreno_writereg(adreno_dev,
 				ADRENO_REG_RBBM_GPR0_CNTL,
 				GBIF_HALT_REQUEST);