Finally fix optdemand & scene_aware

Author: Spirtix

arch/arm64/configs/merge_hi3635_defconfig

@@ -339,7 +339,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y
 # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
 CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-# CONFIG_CPU_FREQ_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_GOV_USERSPACE is not set
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set

drivers/cpufreq/Kconfig

@@ -244,7 +244,6 @@ config CPU_FREQ_GOV_CONSERVATIVE
 
 config CPU_FREQ_GOV_OPTDEMAND
 	tristate "'optdemand' cpufreq policy governor"
-	depends on ARCH_HI6XXX
 	select CPU_FREQ_TABLE
 	select CPU_FREQ_GOV_COMMON
 	help

drivers/cpufreq/cpufreq_optdemand.c

@@ -343,12 +343,6 @@ static void optdemand_dbs_check_cpu(struct dbs_data *dbs_data, int cpu)
 			max_load = load;
 	}
 
-#ifdef CONFIG_SCHED_HMP
-	hmp_slower_domain_avg_load = little_total_load/4;
-	/*hmp_slower_domain_load = min_load;*/
-	hmp_slower_domain_load = hmp_slower_domain_avg_load;
-#endif
-
 	dbs_data->cdata->gov_check_cpu(cpu, max_load);
 }
 
@@ -1306,9 +1300,6 @@ static int cpufreq_governor_optdemand(struct cpufreq_policy *policy,
 
 		cpuinfo->rate_mult = 1;
         cpufreq_optdemand_initialized = 1;
-        #ifdef CONFIG_SCHED_HMP
-        hmp_load_ctrl_flag = 1;
-        #endif
 
 		mutex_unlock(&dbs_data->mutex);
 
@@ -1322,9 +1313,6 @@ static int cpufreq_governor_optdemand(struct cpufreq_policy *policy,
 
 	case CPUFREQ_GOV_STOP:
         cpufreq_optdemand_initialized = 0;
-        #ifdef CONFIG_SCHED_HMP
-        hmp_load_ctrl_flag = 0;
-        #endif
 		gov_cancel_work(dbs_data, policy);
 
 		mutex_lock(&dbs_data->mutex);

drivers/devfreq/Kconfig

@@ -74,9 +74,7 @@ config DEVFREQ_GOV_PM_QOS
 	  Sets the frequency based on pm_qos throughput constraints.
 
 config DEVFREQ_GOV_GPU_SCENE_AWARE
-    tristate "Hisilicon GPU Scene Aware"
-    depends on ARCH_HISI && PM_DEVFREQ
-    select PM_OPP
+    tristate "Scene Aware"
 
 comment "DEVFREQ Drivers"