summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-06 19:45:45 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-06 19:45:45 -0700
commit32993a9f7404cce32fd0f305deab02c74ed96b70 (patch)
tree1d9fe11a4f5fa49abad6b581acc6470d1dce85de /drivers/gpu
parent7108049392c336790216abfc4948613d62a26680 (diff)
parenta694afed7b06eccc1adce71395ae706648f50eb5 (diff)
Merge "msm: kgsl: Disable workaround on A540v2"
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/msm/adreno_a5xx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/msm/adreno_a5xx.c b/drivers/gpu/msm/adreno_a5xx.c
index 1782d1d54946..8ac058a7c5b0 100644
--- a/drivers/gpu/msm/adreno_a5xx.c
+++ b/drivers/gpu/msm/adreno_a5xx.c
@@ -2147,9 +2147,11 @@ static int _me_init_ucode_workarounds(struct adreno_device *adreno_dev)
case ADRENO_REV_A540:
/*
* WFI after every direct-render 3D mode draw and
- * WFI after every 2D Mode 3 draw.
+ * WFI after every 2D Mode 3 draw. This is needed
+ * only on a540v1.
*/
- return 0x0000000A;
+ if (adreno_is_a540v1(adreno_dev))
+ return 0x0000000A;
default:
return 0x00000000; /* No ucode workarounds enabled */
}