evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: kgsl: Add a check for valid frequency of RBBM timer clock"

Browse source
This commit is contained in:
Linux Build Service Account 2018-02-16 06:14:21 -08:00 • committed by Gerrit - the friendly Code Review server
commit 5b91f0e883
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/msm/kgsl_pwrctrl.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2010-2018, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -2124,7 +2124,7 @@ static inline void _close_clks(struct kgsl_device *device)
int kgsl_pwrctrl_init(struct kgsl_device *device) int kgsl_pwrctrl_init(struct kgsl_device *device)
{ {
int i, k, m, n = 0, result; int i, k, m, n = 0, result, freq;
struct platform_device *pdev = device->pdev; struct platform_device *pdev = device->pdev;
struct kgsl_pwrctrl *pwr = &device->pwrctrl; struct kgsl_pwrctrl *pwr = &device->pwrctrl;
struct device_node *ocmem_bus_node; struct device_node *ocmem_bus_node;
@ -2170,7 +2170,7 @@ int kgsl_pwrctrl_init(struct kgsl_device *device)
pwr->wakeup_maxpwrlevel = 0; pwr->wakeup_maxpwrlevel = 0;
for (i = 0; i < pwr->num_pwrlevels; i++) { for (i = 0; i < pwr->num_pwrlevels; i++) {
unsigned int freq = pwr->pwrlevels[i].gpu_freq; freq = pwr->pwrlevels[i].gpu_freq;
if (freq > 0) if (freq > 0)
freq = clk_round_rate(pwr->grp_clks[0], freq); freq = clk_round_rate(pwr->grp_clks[0], freq);
@ -2181,11 +2181,10 @@ int kgsl_pwrctrl_init(struct kgsl_device *device)
kgsl_pwrctrl_clk_set_rate(pwr->grp_clks[0], kgsl_pwrctrl_clk_set_rate(pwr->grp_clks[0],
pwr->pwrlevels[pwr->num_pwrlevels - 1].gpu_freq, clocks[0]); pwr->pwrlevels[pwr->num_pwrlevels - 1].gpu_freq, clocks[0]);
if (pwr->grp_clks[6] != NULL) freq = clk_round_rate(pwr->grp_clks[6], KGSL_RBBMTIMER_CLK_FREQ);
if (freq > 0)
kgsl_pwrctrl_clk_set_rate(pwr->grp_clks[6], kgsl_pwrctrl_clk_set_rate(pwr->grp_clks[6],
clk_round_rate(pwr->grp_clks[6], freq, clocks[6]);
KGSL_RBBMTIMER_CLK_FREQ),
clocks[6]);
_isense_clk_set_rate(pwr, pwr->num_pwrlevels - 1); _isense_clk_set_rate(pwr, pwr->num_pwrlevels - 1);