summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-11-09 16:24:54 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-09 16:24:53 -0800
commit04fa73f4a4a45906915a20249b3b5efe81868a7c (patch)
treeab14c527362dd8aa5cc361b5e8b42199308d852e
parent4a91ea36cbf0f5a782b5b6f69604ed70bd0ab6ba (diff)
parente355a75ded42b0690d0e4cd374084fe878a562ae (diff)
Merge "msm: kgsl: Correct the merciu size for a540"
-rw-r--r--drivers/gpu/msm/adreno_a5xx.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/msm/adreno_a5xx.c b/drivers/gpu/msm/adreno_a5xx.c
index 860f6d2925f1..ea3d7b5a323e 100644
--- a/drivers/gpu/msm/adreno_a5xx.c
+++ b/drivers/gpu/msm/adreno_a5xx.c
@@ -196,6 +196,8 @@ static void a5xx_platform_setup(struct adreno_device *adreno_dev)
/* A510 has 3 XIN ports in VBIF */
gpudev->vbif_xin_halt_ctrl0_mask =
A510_VBIF_XIN_HALT_CTRL0_MASK;
+ } else if (adreno_is_a540(adreno_dev)) {
+ gpudev->snapshot_data->sect_sizes->cp_merciu = 1024;
}
/* Calculate SP local and private mem addresses */