diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-06 13:21:35 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-06 13:21:35 -0800 |
| commit | dac38dcfe215251c2e2ebd6746042b5877d3eb85 (patch) | |
| tree | ad3bb9f093afcb415f3efcd75fa1ef8c6f97472b | |
| parent | bdec82ffe9e5d158552603afb0f6809be3e4ab01 (diff) | |
| parent | fa48f3ab62159c8dd26e91b5b516cc9691a0ab56 (diff) | |
Merge "ARM: dts: msm: Enable GPU NAP state on SDM660"
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-gpu.dtsi | 1 | ||||
| -rw-r--r-- | drivers/gpu/msm/adreno_a5xx.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi b/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi index dedc0c99d2e5..e5cf0b1534ec 100644 --- a/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-gpu.dtsi @@ -71,7 +71,6 @@ /* <HZ/12> */ qcom,idle-timeout = <80>; - qcom,no-nap; qcom,highest-bank-bit = <14>; diff --git a/drivers/gpu/msm/adreno_a5xx.c b/drivers/gpu/msm/adreno_a5xx.c index 15c4b9427f8e..7e2e3aa91fce 100644 --- a/drivers/gpu/msm/adreno_a5xx.c +++ b/drivers/gpu/msm/adreno_a5xx.c @@ -1639,7 +1639,8 @@ static void a5xx_pwrlevel_change_settings(struct adreno_device *adreno_dev, static void a5xx_clk_set_options(struct adreno_device *adreno_dev, const char *name, struct clk *clk) { - if (adreno_is_a540(adreno_dev)) { + /* Handle clock settings for GFX PSCBCs */ + if (adreno_is_a540(adreno_dev) || adreno_is_a512(adreno_dev)) { if (!strcmp(name, "mem_iface_clk")) { clk_set_flags(clk, CLKFLAG_NORETAIN_PERIPH); clk_set_flags(clk, CLKFLAG_NORETAIN_MEM); |