summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-10-13 12:12:17 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-10-13 12:12:17 -0700
commit7b1afd9f0c37cee9c10912f724ff67bb1da0752c (patch)
treef209516fa3ea7aa95a29994e8bffec10cbfa8f6e
parent1d91519ac5f9d59586444454c61ba8115138568a (diff)
parente4a984e18103937a8554fa6c087ef752da43d2f4 (diff)
Merge "msm: kgsl: Add a check for availability of RBBM timer clock"
-rw-r--r--drivers/gpu/msm/kgsl_pwrctrl.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index 8c998a5d791b..c3b3ccf48a7b 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -2181,9 +2181,11 @@ int kgsl_pwrctrl_init(struct kgsl_device *device)
kgsl_pwrctrl_clk_set_rate(pwr->grp_clks[0],
pwr->pwrlevels[pwr->num_pwrlevels - 1].gpu_freq, clocks[0]);
- kgsl_pwrctrl_clk_set_rate(pwr->grp_clks[6],
- clk_round_rate(pwr->grp_clks[6], KGSL_RBBMTIMER_CLK_FREQ),
- clocks[6]);
+ if (pwr->grp_clks[6] != NULL)
+ kgsl_pwrctrl_clk_set_rate(pwr->grp_clks[6],
+ clk_round_rate(pwr->grp_clks[6],
+ KGSL_RBBMTIMER_CLK_FREQ),
+ clocks[6]);
_isense_clk_set_rate(pwr, pwr->num_pwrlevels - 1);