summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-01-03 17:56:49 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-01-03 17:56:49 -0800
commitc07da5b6025d133520eb4eaadddef97b697b7605 (patch)
tree707677785c01ceb971cee3e5a8c0079b80cd5fc3
parent40c4e57f2a46fc60c2bcfd5f445174940289c656 (diff)
parent5cb2ca205ff5530821944c57fa04cce1c756d93b (diff)
Merge "msm: kgsl: Enable Content Protection for A512 GPU"
-rw-r--r--drivers/gpu/msm/adreno-gpulist.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/msm/adreno-gpulist.h b/drivers/gpu/msm/adreno-gpulist.h
index e6163384f9c1..6a00919f144b 100644
--- a/drivers/gpu/msm/adreno-gpulist.h
+++ b/drivers/gpu/msm/adreno-gpulist.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002,2007-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2002,2007-2017, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -289,7 +289,8 @@ static const struct adreno_gpu_core adreno_gpulist[] = {
.major = 1,
.minor = 2,
.patchid = ANY_ID,
- .features = ADRENO_64BIT,
+ .features = ADRENO_64BIT | ADRENO_CONTENT_PROTECTION |
+ ADRENO_CPZ_RETENTION,
.pm4fw_name = "a530_pm4.fw",
.pfpfw_name = "a530_pfp.fw",
.gpudev = &adreno_a5xx_gpudev,