summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-11-09 16:25:02 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-11-09 16:25:01 -0800
commit31ce266c3fbc040c737121ec4b59ee1e9546a187 (patch)
treef586da627e08c49cd635ae3da3cc5ee8a555ca8a
parent67dc1ae4112ad69b53d53235f782a1ab98bb9a57 (diff)
parent0f6fb12d6dadd7e1bd9bd2358d91add3ebc98eaa (diff)
Merge "msm: kgsl: Enable retention for gpu core clock"
-rw-r--r--drivers/gpu/msm/adreno_a5xx.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/msm/adreno_a5xx.c b/drivers/gpu/msm/adreno_a5xx.c
index e92f689a4c3f..be25ec21a026 100644
--- a/drivers/gpu/msm/adreno_a5xx.c
+++ b/drivers/gpu/msm/adreno_a5xx.c
@@ -1536,12 +1536,12 @@ static void a5xx_clk_set_options(struct adreno_device *adreno_dev,
const char *name, struct clk *clk)
{
if (adreno_is_a540(adreno_dev)) {
- if (!strcmp(name, "mem_iface_clk"))
- clk_set_flags(clk, CLKFLAG_NORETAIN_PERIPH);
- clk_set_flags(clk, CLKFLAG_NORETAIN_MEM);
- if (!strcmp(name, "core_clk")) {
+ if (!strcmp(name, "mem_iface_clk")) {
clk_set_flags(clk, CLKFLAG_NORETAIN_PERIPH);
clk_set_flags(clk, CLKFLAG_NORETAIN_MEM);
+ } else if (!strcmp(name, "core_clk")) {
+ clk_set_flags(clk, CLKFLAG_RETAIN_PERIPH);
+ clk_set_flags(clk, CLKFLAG_RETAIN_MEM);
}
}
}