Merge "msm: kgsl: Remove frequency restrictions imposed by initial-min-pwrlevel"

3 files changed, 2 insertions, 6 deletions

diff --git a/adreno.c b/adreno.c
index e029801..ace12d7 100644
--- a/adreno.c
+++ b/adreno.c
@@ -731,7 +731,6 @@ static void adreno_of_get_initial_pwrlevels(struct kgsl_pwrctrl *pwr,
 	if (level < 0 || level >= pwr->num_pwrlevels || level < pwr->default_pwrlevel)
 		level = pwr->num_pwrlevels - 1;
 
-	pwr->min_render_pwrlevel = level;
 	pwr->min_pwrlevel = level;
 }
 
diff --git a/kgsl_pwrctrl.c b/kgsl_pwrctrl.c
index 6f465be..f4e23d2 100644
--- a/kgsl_pwrctrl.c
+++ b/kgsl_pwrctrl.c
@@ -411,9 +411,8 @@ static void kgsl_pwrctrl_min_pwrlevel_set(struct kgsl_device *device,
 	struct kgsl_pwrctrl *pwr = &device->pwrctrl;
 
 	mutex_lock(&device->mutex);
-
-	if (level > pwr->min_render_pwrlevel)
-		level = pwr->min_render_pwrlevel;
+	if (level >= pwr->num_pwrlevels)
+		level = pwr->num_pwrlevels - 1;
 
 	/* You can't set a minimum power level lower than the maximum */
 	if (level < pwr->max_pwrlevel)
diff --git a/kgsl_pwrctrl.h b/kgsl_pwrctrl.h
index 88075bf..e5f1e90 100644
--- a/kgsl_pwrctrl.h
+++ b/kgsl_pwrctrl.h
@@ -87,7 +87,6 @@ struct kgsl_pwrlevel {
  * @default_pwrlevel - device wake up power level
  * @max_pwrlevel - maximum allowable powerlevel per the user
  * @min_pwrlevel - minimum allowable powerlevel per the user
- * @min_render_pwrlevel - minimum allowable powerlevel for rendering
  * @num_pwrlevels - number of available power levels
  * @throttle_mask - LM throttle mask
  * @interval_timeout - timeout to be idle before a power event
@@ -130,7 +129,6 @@ struct kgsl_pwrctrl {
 	unsigned int default_pwrlevel;
 	unsigned int max_pwrlevel;
 	unsigned int min_pwrlevel;
-	unsigned int min_render_pwrlevel;
 	unsigned int num_pwrlevels;
 	unsigned int throttle_mask;
 	u32 interval_timeout;