From: Rob Clark <robdclark@gmail.com>
Date: Wed, 24 Feb 2016 23:56:24 +0000 (-0500)
Subject: drm/msm/adreno: remove duplicate adreno_hw_init() call
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7977f4426c44da95c5dba91a62f099411e029de8;p=linux-beck.git

drm/msm/adreno: remove duplicate adreno_hw_init() call

Not sure where it came from, but seem unintentional.  And also not
needed on a420, so let's just drop it.

Signed-off-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c
index b371f1c04a47..d0d3c7baa8fe 100644
--- a/drivers/gpu/drm/msm/adreno/a4xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a4xx_gpu.c
@@ -238,12 +238,6 @@ static int a4xx_hw_init(struct msm_gpu *gpu)
 		gpu_write(gpu, REG_A4XX_RBBM_CLOCK_DELAY_HLSQ, val);
 	}
 
-	if (!adreno_is_a430(adreno_gpu)) {
-		ret = adreno_hw_init(gpu);
-		if (ret)
-			return ret;
-	}
-
 	/* setup access protection: */
 	gpu_write(gpu, REG_A4XX_CP_PROTECT_CTRL, 0x00000007);