msm: kgsl: Disable workaround on A540v2

Currently we have a workaround for A540 which inserts
WFI after every direct-render 3D mode and every 2D
mode draw. Add a check to enable this only on A540v1
as this workaround is not required for A540v2.

CRs-Fixed: 1072767
Change-Id: I679bbf68ee3dcc1aee30d56a646a42b6ff09fb6f
Signed-off-by: Harshdeep Dhatt <hdhatt@codeaurora.org>

diff --git a/drivers/gpu/msm/adreno_a5xx.c b/drivers/gpu/msm/adreno_a5xx.c
index 583de85..1ad96f9 100644 (file)
--- a/drivers/gpu/msm/adreno_a5xx.c
+++ b/drivers/gpu/msm/adreno_a5xx.c
@@ -2127,9 +2127,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 */
        }