summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorOleg Perelet <operelet@codeaurora.org>2016-06-27 09:41:19 -0700
committerKyle Yan <kyan@codeaurora.org>2016-06-29 15:00:26 -0700
commit9ba8db37da2ded19a883560e443aadad544d4dcb (patch)
tree46d34369d106febcc965061da7561b304d7745cc /drivers
parentd822846701e96b3f2914e10129d751e0fcded71e (diff)
msm: kgsl: Fix calculation error for deep nap timer value.
Deep nap timer value was not calculated right when read from dts file. CRs-Fixed: 973565 Change-Id: I11a70c61d408921edd89b1417b209c5c5a3ddf24 Signed-off-by: Oleg Perelet <operelet@codeaurora.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/msm/kgsl_pwrctrl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index 15c10ad073e6..66d2021eb040 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -1746,9 +1746,10 @@ int kgsl_pwrctrl_init(struct kgsl_device *device)
pwr->grp_clks[0] = pwr->grp_clks[1];
if (of_property_read_u32(pdev->dev.of_node, "qcom,deep-nap-timeout",
- &pwr->deep_nap_timeout))
- pwr->deep_nap_timeout = 20;
+ &result))
+ result = 20;
+ pwr->deep_nap_timeout = msecs_to_jiffies(result);
pwr->gx_retention = of_property_read_bool(pdev->dev.of_node,
"qcom,gx-retention");
if (pwr->gx_retention) {
@@ -2246,7 +2247,7 @@ _nap(struct kgsl_device *device)
kgsl_pwrscale_update_stats(device);
mod_timer(&device->pwrctrl.deep_nap_timer, jiffies +
- msecs_to_jiffies(device->pwrctrl.deep_nap_timeout));
+ device->pwrctrl.deep_nap_timeout);
kgsl_pwrctrl_clk(device, KGSL_PWRFLAGS_OFF, KGSL_STATE_NAP);
kgsl_pwrctrl_set_state(device, KGSL_STATE_NAP);