diff options
| author | Tim Murray <timmurray@google.com> | 2015-10-06 01:08:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-06 01:08:41 +0000 |
| commit | b4864741f939f61dfd3cc809706af4d864c598c8 (patch) | |
| tree | 5fc87f3f140d46a91d58a93271138e2e1a2cf1bf | |
| parent | ddc0f2c31963e280847c3cdb83990263459bbd5c (diff) | |
| parent | 7bafe338e7998c7dd9e639f94698909400227c97 (diff) | |
| download | angler-b4864741f939f61dfd3cc809706af4d864c598c8.tar.gz | |
Merge changes Ifb32729f,I8a8638f6 into mnc-dr-dev
* changes:
Enable touch boost during camera.
Modify screen-off behavior.
| -rwxr-xr-x | init.angler.rc | 1 | ||||
| -rw-r--r-- | power/power-8994.c | 16 | ||||
| -rw-r--r-- | power/power.c | 4 | ||||
| -rw-r--r-- | power/utils.c | 2 |
4 files changed, 12 insertions, 11 deletions
diff --git a/init.angler.rc b/init.angler.rc index 795fbc0..82199a2 100755 --- a/init.angler.rc +++ b/init.angler.rc @@ -327,6 +327,7 @@ service qcamerasvr /system/bin/mm-qcamera-daemon class late_start user camera group camera system inet input graphics + writepid /dev/cpuset/system-background/tasks service fingerprintd /system/bin/fingerprintd class late_start diff --git a/power/power-8994.c b/power/power-8994.c index 53d8179..6ca1110 100644 --- a/power/power-8994.c +++ b/power/power-8994.c @@ -38,7 +38,7 @@ #include <pthread.h> #include <stdbool.h> -#define LOG_TAG "QCOM PowerHAL" +#define LOG_TAG "QCOMPowerHAL" #include <utils/Log.h> #include <hardware/hardware.h> #include <hardware/power.h> @@ -78,11 +78,10 @@ static void* video_encode_hint_function(void* arg) { // if should_enable is false, we've already quit the camera if (video_encode_hint_should_enable == true && video_encode_hint_counter == expected_counter) { /* sched and cpufreq params - * A57 - offlines - * A53 - 4 cores online at 1.2GHz - */ - int resource_values[] = {0x150C, 0x160C, 0x170C, 0x180C, 0x3DFF}; - + A53: 4 cores online at 1.2GHz max, 960 min + A57: 4 cores online at 384 max, 384 min + */ + int resource_values[] = {0x150C, 0x1F03, 0x2303}; perform_hint_action(new_hint_id, resource_values, sizeof(resource_values)/sizeof(resource_values[0])); cur_hint_id = new_hint_id; @@ -177,7 +176,6 @@ int power_hint_override(struct power_module *module, power_hint_t hint, void *da int set_interactive_override(struct power_module *module, int on) { - return HINT_HANDLED; /* Don't excecute this code path, not in use */ char governor[80]; if (get_scaling_governor(governor, sizeof(governor)) == -1) { @@ -190,7 +188,9 @@ int set_interactive_override(struct power_module *module, int on) /* Display off */ if ((strncmp(governor, INTERACTIVE_GOVERNOR, strlen(INTERACTIVE_GOVERNOR)) == 0) && (strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) { - int resource_values[] = {}; /* dummy node */ + // sched upmigrate = 99, sched downmigrate = 95 + // keep the big cores around, but make them very hard to use + int resource_values[] = {0x4E63, 0x4F5F}; if (!display_hint_sent) { perform_hint_action(DISPLAY_STATE_HINT_ID, resource_values, sizeof(resource_values)/sizeof(resource_values[0])); diff --git a/power/power.c b/power/power.c index da8e9ed..308ea0c 100644 --- a/power/power.c +++ b/power/power.c @@ -37,7 +37,7 @@ #include <dlfcn.h> #include <stdlib.h> -#define LOG_TAG "QCOM PowerHAL" +#define LOG_TAG "QCOMPowerHAL" #include <utils/Log.h> #include <hardware/hardware.h> #include <hardware/power.h> @@ -221,7 +221,7 @@ static void power_hint(struct power_module *module, power_hint_t hint, static int handle_little = 0; // big core freq bump for 500ms - int resources_big[] = {0x1F08}; + int resources_big[] = {0x2312, 0x1F08}; int duration_big = 500; static int handle_big = 0; diff --git a/power/utils.c b/power/utils.c index 0e7670e..199425b 100644 --- a/power/utils.c +++ b/power/utils.c @@ -39,7 +39,7 @@ #include "hint-data.h" #include "power-common.h" -#define LOG_TAG "QCOM PowerHAL" +#define LOG_TAG "QCOMPowerHAL" #include <utils/Log.h> #define INTERACTION_BOOST |