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

Merge "msm: kgsl: Change pwrlevels array index type to unsigned int"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-16 21:04:52 -07:00 • committed by Gerrit - the friendly Code Review server
commit 9c48a514dd
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gpu/msm/kgsl_pwrscale.c
View file

@ -522,7 +522,8 @@ int kgsl_devfreq_target(struct device *dev, unsigned long *freq, u32 flags)
struct kgsl_device *device = dev_get_drvdata(dev);
struct kgsl_pwrctrl *pwr;
struct kgsl_pwrlevel *pwr_level;
int level, i;
int level;
unsigned int i;
unsigned long cur_freq;
if (device == NULL)
@ -551,10 +552,11 @@ int kgsl_devfreq_target(struct device *dev, unsigned long *freq, u32 flags)
if (*freq != cur_freq) {
level = pwr->max_pwrlevel;
/*
* To avoid infinite loop issue type cast max_pwrlevel to
* signed integer type
* Array index of pwrlevels[] should be within the permitted
* power levels, i.e., from max_pwrlevel to min_pwrlevel.
*/
for (i = pwr->min_pwrlevel; i >= (int)pwr->max_pwrlevel; i--)
for (i = pwr->min_pwrlevel; (i >= pwr->max_pwrlevel
&& i <= pwr->min_pwrlevel); i--)
if (*freq <= pwr->pwrlevels[i].gpu_freq) {
if (pwr->thermal_cycle == CYCLE_ACTIVE)
level = _thermal_adjust(pwr, i);