From 9e47f5a1ce41b54fc17d066b1b4a794277e6fcc6 Mon Sep 17 00:00:00 2001 From: Ankur Bakshi Date: Wed, 14 Aug 2024 23:07:09 +0000 Subject: [PATCH 1/2] Update felix SVN to 55 Bug:352170103 Change-Id: Ib76fb34d8c9fa0317c7cc150a80d5fe79bcec81f Flag: EXEMPT bugfix --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 64f343d..710b13e 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -221,7 +221,7 @@ ifdef RELEASE_SVN_FELIX TARGET_SVN ?= $(RELEASE_SVN_FELIX) else # Set this for older releases that don't use build flag -TARGET_SVN ?= 54 +TARGET_SVN ?= 55 endif PRODUCT_VENDOR_PROPERTIES += \ From 5142673794cb6dba72d742c115d7b28405f4c035 Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Wed, 14 Aug 2024 08:55:36 +0000 Subject: [PATCH 2/2] thermal:remove unused state2power value Bug: 355566259 Test: Build test Flag: EXEMPT NDK Change-Id: Ib3e2e2772c340d13f3bc80583f6e1f1b7715a44d Signed-off-by: Peter (YM) --- thermal_info_config_felix.json | 12 ++++-------- thermal_info_config_proactive_skin_felix.json | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index a0bc0f2..5f16bf3 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -842,26 +842,22 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":[516, 456, 392, 296, 264, 216, 184, 140, 100, 68, 28] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":[2466, 2166, 1840, 1544, 1260, 1024, 816, 642, 538, 410, 342, 276, 224, 162, 104] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":[4920, 4614, 4092, 3684, 3198, 2820, 2354, 2184, 1862, 1476, 1338, 1110, 928, 738, 552, 450, 362, 188] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", - "State2Power":[1925, 1528, 1258, 928, 795, 703, 573, 481, 396, 314, 236] + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { "Name":"chg_mdis", diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json index 5c10f4b..e45ecb5 100644 --- a/thermal_info_config_proactive_skin_felix.json +++ b/thermal_info_config_proactive_skin_felix.json @@ -872,26 +872,22 @@ { "Name":"thermal-cpufreq-0", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote", - "State2Power":[516, 456, 392, 296, 264, 216, 184, 140, 100, 68, 28] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote" }, { "Name":"thermal-cpufreq-1", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote", - "State2Power":[2466, 2166, 1840, 1544, 1260, 1024, 816, 642, 538, 410, 342, 276, 224, 162, 104] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote" }, { "Name":"thermal-cpufreq-2", "Type":"CPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote", - "State2Power":[4920, 4614, 4092, 3684, 3198, 2820, 2354, 2184, 1862, 1476, 1338, 1110, 928, 738, 552, 450, 362, 188] + "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote" }, { "Name":"thermal-gpufreq-0", "Type":"GPU", - "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote", - "State2Power":[1925, 1528, 1258, 928, 795, 703, 573, 481, 396, 314, 236] + "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote" }, { "Name":"chg_mdis",