summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorChanwoo Choi <cw00.choi@samsung.com>2015-07-14 18:53:42 +0900
committerSeung-Woo Kim <sw0312.kim@samsung.com>2016-12-14 13:46:48 +0900
commitca88176a87dd14e3fe479341b6f4242b55f4ebe8 (patch)
tree7db15d7032a2157f9c87c744fa6c58b159464631 /drivers
parentf2fd4b819e45c242664473432b91410afa1235bd (diff)
gpu: arm: Fix build warning about devfreq cooling device
This patch fixes the build warning according to new devfreq_cooling device driver and make the frequency table as descending order. Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/arm/midgard/mali_kbase_defs.h2
-rw-r--r--drivers/gpu/arm/midgard/mali_kbase_devfreq.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase_defs.h b/drivers/gpu/arm/midgard/mali_kbase_defs.h
index 9484f0f72aa6..f195ee7e92b7 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_defs.h
+++ b/drivers/gpu/arm/midgard/mali_kbase_defs.h
@@ -815,7 +815,7 @@ struct kbase_device {
struct devfreq *devfreq;
unsigned long freq;
#ifdef CONFIG_DEVFREQ_THERMAL
- struct devfreq_cooling_device *devfreq_cooling;
+ struct thermal_cooling_device *devfreq_cooling;
#ifdef CONFIG_MALI_POWER_ACTOR
struct power_actor *power_actor;
#endif
diff --git a/drivers/gpu/arm/midgard/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/mali_kbase_devfreq.c
index 0f738c55d1d9..fd80b4611922 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_devfreq.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_devfreq.c
@@ -174,8 +174,9 @@ static int kbase_devfreq_init_freq_table(struct kbase_device *kbdev,
return -ENOMEM;
rcu_read_lock();
- for (i = 0; i < count; i++, freq++) {
- opp = dev_pm_opp_find_freq_ceil(kbdev->dev, &freq);
+ freq = ULONG_MAX;
+ for (i = 0; i < count; i++, freq--) {
+ opp = dev_pm_opp_find_freq_floor(kbdev->dev, &freq);
if (IS_ERR(opp))
break;