PowerHAL: Remove extra/unwanted power hints
CarbonROM uses AOSP, and the follwing power hints are not part of AOSP, causing a build fail:
- POWER_HINT_CPU_BOOST
- POWER_HINT_AUDIO
Commented out the code that calls them, and adjusted the last power hint available to AOSP.
Change-Id: I4962f987d0bfb6a78c458c6e9803736809d39ab5
diff --git a/nvpowerhal.cpp b/nvpowerhal.cpp
index fc4e87a..68899ab 100644
--- a/nvpowerhal.cpp
+++ b/nvpowerhal.cpp
@@ -259,8 +259,8 @@
// the interaction boost so that we can maintain is constantly during
// interaction.
pInfo->hint_interval[POWER_HINT_INTERACTION] = 90000;
- pInfo->hint_interval[POWER_HINT_CPU_BOOST] = 500000;
- pInfo->hint_interval[POWER_HINT_AUDIO] = 500000;
+ //pInfo->hint_interval[POWER_HINT_CPU_BOOST] = 500000;
+ //pInfo->hint_interval[POWER_HINT_AUDIO] = 500000;
pInfo->hint_interval[POWER_HINT_LOW_POWER] = 0;
// Initialize features
@@ -487,35 +487,35 @@
396000,
s2ns(2));
break;
- case POWER_HINT_CPU_BOOST:
- // Boost to 1.2Ghz dual core
- pInfo->mTimeoutPoker->requestPmQosTimed(PMQOS_CONSTRAINT_CPU_FREQ,
- PM_QOS_BOOST_PRIORITY,
- PM_QOS_DEFAULT_VALUE,
- INT_MAX,
- ms2ns(1500));
- pInfo->mTimeoutPoker->requestPmQosTimed(PMQOS_CONSTRAINT_ONLINE_CPUS,
- PM_QOS_BOOST_PRIORITY,
- PM_QOS_DEFAULT_VALUE,
- 2,
- ms2ns(1500));
- pInfo->mTimeoutPoker->requestPmQosTimed(PMQOS_CONSTRAINT_GPU_FREQ,
- PM_QOS_BOOST_PRIORITY,
- PM_QOS_DEFAULT_VALUE,
- 180000,
- ms2ns(1500));
- pInfo->mTimeoutPoker->requestPmQosTimed("/dev/emc_freq_min",
- 792000,
- ms2ns(1500));
- break;
- case POWER_HINT_AUDIO:
- // Boost to 512 Mhz frequency for one second
- pInfo->mTimeoutPoker->requestPmQosTimed(PMQOS_CONSTRAINT_CPU_FREQ,
- PM_QOS_BOOST_PRIORITY,
- PM_QOS_DEFAULT_VALUE,
- 512000,
- s2ns(1));
- break;
+ //case POWER_HINT_CPU_BOOST:
+ // // Boost to 1.2Ghz dual core
+ // pInfo->mTimeoutPoker->requestPmQosTimed(PMQOS_CONSTRAINT_CPU_FREQ,
+ // PM_QOS_BOOST_PRIORITY,
+ // PM_QOS_DEFAULT_VALUE,
+ // INT_MAX,
+ // ms2ns(1500));
+ // pInfo->mTimeoutPoker->requestPmQosTimed(PMQOS_CONSTRAINT_ONLINE_CPUS,
+ // PM_QOS_BOOST_PRIORITY,
+ // PM_QOS_DEFAULT_VALUE,
+ // 2,
+ // ms2ns(1500));
+ // pInfo->mTimeoutPoker->requestPmQosTimed(PMQOS_CONSTRAINT_GPU_FREQ,
+ // PM_QOS_BOOST_PRIORITY,
+ // PM_QOS_DEFAULT_VALUE,
+ // 180000,
+ // ms2ns(1500));
+ // pInfo->mTimeoutPoker->requestPmQosTimed("/dev/emc_freq_min",
+ // 792000,
+ // ms2ns(1500));
+ // break;
+ //case POWER_HINT_AUDIO:
+ // // Boost to 512 Mhz frequency for one second
+ // pInfo->mTimeoutPoker->requestPmQosTimed(PMQOS_CONSTRAINT_CPU_FREQ,
+ // PM_QOS_BOOST_PRIORITY,
+ // PM_QOS_DEFAULT_VALUE,
+ // 512000,
+ // s2ns(1));
+ // break;
case POWER_HINT_LOW_POWER:
#ifdef POWER_MODE_SET_INTERACTIVE
// Set interactive governor parameters according to power mode
diff --git a/powerhal.h b/powerhal.h
index 56852c8..f5e9c20 100644
--- a/powerhal.h
+++ b/powerhal.h
@@ -30,7 +30,7 @@
#define MAX_INPUT_DEV_COUNT 12
#define MAX_USE_CASE_STRING_SIZE 80
// This needs set to the largest power hint in the enum in hardware/power.h
-#define MAX_POWER_HINT_COUNT POWER_HINT_SET_PROFILE
+#define MAX_POWER_HINT_COUNT POWER_HINT_LOW_POWER
#define DEFAULT_MIN_ONLINE_CPUS 2
#define DEFAULT_MAX_ONLINE_CPUS 0