Promotion of android-device.lnx.1.0-00039.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
972647   Ic418dd93d12e187e86fc88c7a2147b672dbe15fa   power: Modifying resource IDs for video encode power Hin
972647   Ice606eb34ec175f17c69d86961889cad96c53a5f   power: add support for PowerHAL in Feero
970804   I3b7f4908cb6a7b30fe69923570145a2a0caae927   BTLogKit: Removed BTLogKit, BTLogSave, BTTestApp and Hid
972821   I36a14cba92f98616de9221d0ea1149dc5abcc456   FM: Remove unwanted FM application

Change-Id: Ia7842577288799c5111a95dc3a235f667cacc328
CRs-Fixed: 972647, 972821, 970804
This commit is contained in:
Linux Build Service Account 2016-02-09 07:39:04 -08:00
commit a7b2c53583
4 changed files with 42 additions and 16 deletions

View File

@ -698,9 +698,7 @@ PRODUCT_PACKAGES := \
SyncProvider \
IM \
VoiceDialer \
FMRadio \
FM2 \
FMRadio \
FMRecord \
VideoEditor
@ -708,11 +706,7 @@ PRODUCT_PACKAGES := \
ifneq ($(TARGET_USES_AOSP),true)
PRODUCT_PACKAGES += \
BluetoothExt \
BTTestApp \
HiddTestApp \
BTLogKit \
a4wpservice \
BTLogSave \
wipowerservice
endif

View File

@ -35,6 +35,10 @@ ifeq ($(call is-board-platform-in-list, msm8996), true)
LOCAL_SRC_FILES += power-8996.c
endif
ifeq ($(call is-board-platform-in-list,msm8937), true)
LOCAL_SRC_FILES += power-8952.c
endif
ifeq ($(call is-board-platform-in-list,msm8952), true)
LOCAL_SRC_FILES += power-8952.c
endif

View File

@ -137,7 +137,7 @@ enum INTERACTIVE_TIMER_RATE_LVL {
};
/* This timer rate applicable to cpu0
across 8939/8952 series chipset */
across 8939 series chipset */
enum INTERACTIVE_TIMER_RATE_LVL_CPU0_8939 {
TR_MS_CPU0_500 = 0x30CD,
TR_MS_CPU0_100 = 0x30F5,
@ -147,7 +147,7 @@ enum INTERACTIVE_TIMER_RATE_LVL_CPU0_8939 {
};
/* This timer rate applicable to cpu4
across 8939/8952 series chipset */
across 8939 series chipset */
enum INTERACTIVE_TIMER_RATE_LVL_CPU4_8939 {
TR_MS_CPU4_500 = 0x3BCD,
TR_MS_CPU4_100 = 0x3BF5,
@ -156,6 +156,26 @@ enum INTERACTIVE_TIMER_RATE_LVL_CPU4_8939 {
TR_MS_CPU4_20 = 0x3BFD,
};
/* This timer rate applicable to big.little arch */
enum INTERACTIVE_TIMER_RATE_LVL_BIG_LITTLE {
BIG_LITTLE_TR_MS_100 = 0x64,
BIG_LITTLE_TR_MS_50 = 0x32,
BIG_LITTLE_TR_MS_40 = 0x28,
BIG_LITTLE_TR_MS_30 = 0x1E,
BIG_LITTLE_TR_MS_20 = 0x14,
};
/* INTERACTIVE opcodes */
enum INTERACTIVE_OPCODES {
INT_OP_CLUSTER0_TIMER_RATE = 0x41424000,
INT_OP_CLUSTER1_TIMER_RATE = 0x41424100,
INT_OP_CLUSTER0_USE_SCHED_LOAD = 0x41430000,
INT_OP_CLUSTER1_USE_SCHED_LOAD = 0x41430100,
INT_OP_CLUSTER0_USE_MIGRATION_NOTIF = 0x41434000,
INT_OP_CLUSTER1_USE_MIGRATION_NOTIF = 0x41434100,
INT_OP_NOTIFY_ON_MIGRATE = 0x4241C000
};
enum INTERACTIVE_HISPEED_FREQ_LVL {
HS_FREQ_1026 = 0xF0A,
};
@ -189,11 +209,6 @@ enum THREAD_MIGRATION_LVL {
THREAD_MIGRATION_SYNC_OFF = 0x1400,
};
enum SCHED_GUIDED_LVL {
INTERACTIVE_USE_SCHED_LOAD_OFF = 0x5201,
INTERACTIVE_USE_MIGRATION_NOTIF_OFF = 0x5301
};
enum INTERACTIVE_IO_BUSY_LVL {
INTERACTIVE_IO_BUSY_OFF = 0x1B00,
INTERACTIVE_IO_BUSY_ON = 0x1B01,

View File

@ -94,7 +94,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[] = {TR_MS_CPU0_50,TR_MS_CPU4_50, THREAD_MIGRATION_SYNC_OFF};
int resource_values[] = {INT_OP_CLUSTER0_TIMER_RATE, BIG_LITTLE_TR_MS_50,
INT_OP_CLUSTER1_TIMER_RATE, BIG_LITTLE_TR_MS_50,
INT_OP_NOTIFY_ON_MIGRATE, 0x00};
if (!display_hint_sent) {
perform_hint_action(DISPLAY_STATE_HINT_ID,
@ -159,8 +161,19 @@ static void process_video_encode_hint(void *metadata)
strlen(INTERACTIVE_GOVERNOR)) == 0) &&
(strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) {
/* Sched_load and migration_notif*/
int resource_values[] = {INTERACTIVE_USE_SCHED_LOAD_OFF,
INTERACTIVE_USE_MIGRATION_NOTIF_OFF};
int resource_values[] = {INT_OP_CLUSTER0_USE_SCHED_LOAD,
0x1,
INT_OP_CLUSTER1_USE_SCHED_LOAD,
0x1,
INT_OP_CLUSTER0_USE_MIGRATION_NOTIF,
0x1,
INT_OP_CLUSTER1_USE_MIGRATION_NOTIF,
0x1,
INT_OP_CLUSTER0_TIMER_RATE,
BIG_LITTLE_TR_MS_40,
INT_OP_CLUSTER1_TIMER_RATE,
BIG_LITTLE_TR_MS_40
};
if (!video_encode_hint_sent) {
perform_hint_action(video_encode_metadata.hint_id,
resource_values,