diff options
| author | Rob Clark <robdclark@gmail.com> | 2016-02-24 18:56:24 -0500 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2016-03-03 11:55:32 -0500 |
| commit | 7977f4426c44da95c5dba91a62f099411e029de8 (patch) | |
| tree | 41ee510e766c8b62611737fd3602fcf20297a3ab | |
| parent | 6c77d1abe61797239533918d7a0336fc84f4aef1 (diff) | |
| download | linux-stable-7977f4426c44da95c5dba91a62f099411e029de8.tar.gz linux-stable-7977f4426c44da95c5dba91a62f099411e029de8.tar.bz2 linux-stable-7977f4426c44da95c5dba91a62f099411e029de8.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 6 |
1 files changed, 0 insertions, 6 deletions
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); |