Merge "msm: kgsl: Remove dead code related to devfreq"

4 files changed, 3 insertions, 47 deletions

diff --git a/kgsl_pwrctrl.c b/kgsl_pwrctrl.c
index b068ef5..6f465be 100644
--- a/kgsl_pwrctrl.c
+++ b/kgsl_pwrctrl.c
@@ -1567,8 +1567,6 @@ int kgsl_pwrctrl_init(struct kgsl_device *device)
 	pwr->thermal_pwrlevel = 0;
 	pwr->thermal_pwrlevel_floor = pwr->num_pwrlevels - 1;
 
-	pwr->wakeup_maxpwrlevel = 0;
-
 	result = dev_pm_qos_add_request(&pdev->dev, &pwr->sysfs_thermal_req,
 			DEV_PM_QOS_MAX_FREQUENCY,
 			PM_QOS_MAX_FREQUENCY_DEFAULT_VALUE);
@@ -1755,12 +1753,7 @@ static int kgsl_pwrctrl_enable(struct kgsl_device *device)
 	struct kgsl_pwrctrl *pwr = &device->pwrctrl;
 	int level, status;
 
-	if (pwr->wakeup_maxpwrlevel) {
-		level = pwr->max_pwrlevel;
-		pwr->wakeup_maxpwrlevel = 0;
-	} else {
-		level = pwr->default_pwrlevel;
-	}
+	level = pwr->default_pwrlevel;
 
 	kgsl_pwrctrl_pwrlevel_change(device, level);
 
diff --git a/kgsl_pwrctrl.h b/kgsl_pwrctrl.h
index 55dbebe..88075bf 100644
--- a/kgsl_pwrctrl.h
+++ b/kgsl_pwrctrl.h
@@ -128,7 +128,6 @@ struct kgsl_pwrctrl {
 	unsigned int thermal_pwrlevel;
 	unsigned int thermal_pwrlevel_floor;
 	unsigned int default_pwrlevel;
-	unsigned int wakeup_maxpwrlevel;
 	unsigned int max_pwrlevel;
 	unsigned int min_pwrlevel;
 	unsigned int min_render_pwrlevel;
diff --git a/kgsl_pwrscale.c b/kgsl_pwrscale.c
index ceca7a7..7b0f0e5 100644
--- a/kgsl_pwrscale.c
+++ b/kgsl_pwrscale.c
@@ -204,18 +204,6 @@ void kgsl_pwrscale_enable(struct kgsl_device *device)
 	}
 }
 
-#ifdef DEVFREQ_FLAG_WAKEUP_MAXFREQ
-static inline bool _check_maxfreq(u32 flags)
-{
-	return (flags & DEVFREQ_FLAG_WAKEUP_MAXFREQ);
-}
-#else
-static inline bool _check_maxfreq(u32 flags)
-{
-	return false;
-}
-#endif
-
 /*
  * kgsl_devfreq_target - devfreq_dev_profile.target callback
  * @dev: see devfreq.h
@@ -257,15 +245,6 @@ int kgsl_devfreq_target(struct device *dev, unsigned long *freq, u32 flags)
 	}
 	pwr = &device->pwrctrl;
 
-	if (_check_maxfreq(flags)) {
-		/*
-		 * The GPU is about to get suspended,
-		 * but it needs to be at the max power level when waking up
-		 */
-		pwr->wakeup_maxpwrlevel = 1;
-		return 0;
-	}
-
 	rec_freq = *freq;
 
 	mutex_lock(&device->mutex);
@@ -436,29 +415,15 @@ int kgsl_busmon_get_dev_status(struct device *dev,
 	return 0;
 }
 
-#ifdef DEVFREQ_FLAG_FAST_HINT
 static inline bool _check_fast_hint(u32 flags)
 {
 	return (flags & DEVFREQ_FLAG_FAST_HINT);
 }
-#else
-static inline bool _check_fast_hint(u32 flags)
-{
-	return false;
-}
-#endif
 
-#ifdef DEVFREQ_FLAG_SLOW_HINT
 static inline bool _check_slow_hint(u32 flags)
 {
 	return (flags & DEVFREQ_FLAG_SLOW_HINT);
 }
-#else
-static inline bool _check_slow_hint(u32 flags)
-{
-	return false;
-}
-#endif
 
 /*
  * kgsl_busmon_target - devfreq_dev_profile.target callback
diff --git a/msm_adreno_devfreq.h b/msm_adreno_devfreq.h
index e1bb696..c936435 100644
--- a/msm_adreno_devfreq.h
+++ b/msm_adreno_devfreq.h
@@ -10,9 +10,8 @@
 #include <linux/devfreq.h>
 #include <linux/notifier.h>
 
-#define DEVFREQ_FLAG_WAKEUP_MAXFREQ	0x2
-#define DEVFREQ_FLAG_FAST_HINT		0x4
-#define DEVFREQ_FLAG_SLOW_HINT		0x8
+#define DEVFREQ_FLAG_FAST_HINT		0x1
+#define DEVFREQ_FLAG_SLOW_HINT		0x2
 
 struct device;