From 5a9d9cb5f243f35b76b106c15e1c14be3df63fd5 Mon Sep 17 00:00:00 2001 From: Kamal Shafi Date: Thu, 21 Mar 2024 08:40:34 +0000 Subject: [PATCH 1/2] Revert "caimito: add system imu property" This reverts commit f90e1873c43b485aa15e42b5abefa1af6d967ef7. Reason for revert: b/330294678 device suspend caused probe stop halfway and device wastes power. Bug: 330294678 Test: build Change-Id: I937b6d3bf8c6b46dc460080b0c47aa8f139d9d25 --- device-caiman.mk | 4 ---- device-komodo.mk | 4 ---- device-tokay.mk | 4 ---- 3 files changed, 12 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 365fe4e3..c8fcdc9e 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -280,10 +280,6 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.als_feed_forward_supported=true \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true -# OIS with system imu -PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.camera.ois_with_system_imu=true - # Camera Vendor property PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.front_720P_always_binning=true diff --git a/device-komodo.mk b/device-komodo.mk index 184b0f36..3a4d18d2 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -299,10 +299,6 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.als_feed_forward_supported=true \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true -# OIS with system imu -PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.camera.ois_with_system_imu=true - # Camera Vendor property PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.front_720P_always_binning=true diff --git a/device-tokay.mk b/device-tokay.mk index 8db8b7f6..e0299caf 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -269,10 +269,6 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.als_feed_forward_supported=true \ persist.vendor.udfps.lhbm_controlled_in_hal_supported=true -# OIS with system imu -PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.camera.ois_with_system_imu=true - # Camera Vendor property PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.front_720P_always_binning=true From cbfd6677185fa017d158e3ef4bf9535d2fd6cd65 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 21 Mar 2024 00:48:15 +0000 Subject: [PATCH 2/2] therma: disable LIGHT tier throttling when gaming We already have the CPU scheduler optimization for game mode to sustain the power and perf, so remove the CPU thermal policy at lower temperature to avoid the interfence on CPU scheduler. Bug: 329697728 Test: run genshin Change-Id: Ib0d47b3de7b3550a3af4db37ef062f8c5d2ea262 --- perf/powerhint-caiman.json | 17 +++++++++++++++++ perf/powerhint-komodo.json | 17 +++++++++++++++++ perf/powerhint-tokay.json | 17 +++++++++++++++++ thermal/thermal_info_config_caiman.json | 25 +++++++++++++++++++++++++ thermal/thermal_info_config_komodo.json | 25 +++++++++++++++++++++++++ thermal/thermal_info_config_tokay.json | 25 +++++++++++++++++++++++++ 6 files changed, 126 insertions(+) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index a2c9444d..51fc33cd 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -770,6 +770,17 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "VIRTUAL-SKIN-CPU-LIGHT-ODPM", + "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-LIGHT-ODPM.profile", + "Values": [ + "", + "game" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Property" + }, { "Name": "VIRTUAL-SKIN-CPU-MID", "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile", @@ -2601,6 +2612,12 @@ "Duration": 0, "Value": "419000" }, + { + "PowerHint": "GAME", + "Node": "VIRTUAL-SKIN-CPU-LIGHT-ODPM", + "Duration": 0, + "Value": "game" + }, { "PowerHint": "GAME", "Node": "VIRTUAL-SKIN-CPU-MID", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index a2c9444d..51fc33cd 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -770,6 +770,17 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "VIRTUAL-SKIN-CPU-LIGHT-ODPM", + "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-LIGHT-ODPM.profile", + "Values": [ + "", + "game" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Property" + }, { "Name": "VIRTUAL-SKIN-CPU-MID", "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile", @@ -2601,6 +2612,12 @@ "Duration": 0, "Value": "419000" }, + { + "PowerHint": "GAME", + "Node": "VIRTUAL-SKIN-CPU-LIGHT-ODPM", + "Duration": 0, + "Value": "game" + }, { "PowerHint": "GAME", "Node": "VIRTUAL-SKIN-CPU-MID", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index a2c9444d..51fc33cd 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -770,6 +770,17 @@ "DefaultIndex": 0, "ResetOnInit": true }, + { + "Name": "VIRTUAL-SKIN-CPU-LIGHT-ODPM", + "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-LIGHT-ODPM.profile", + "Values": [ + "", + "game" + ], + "DefaultIndex": 0, + "ResetOnInit": true, + "Type": "Property" + }, { "Name": "VIRTUAL-SKIN-CPU-MID", "Path": "vendor.thermal.VIRTUAL-SKIN-CPU-MID.profile", @@ -2601,6 +2612,12 @@ "Duration": 0, "Value": "419000" }, + { + "PowerHint": "GAME", + "Node": "VIRTUAL-SKIN-CPU-LIGHT-ODPM", + "Duration": 0, + "Value": "game" + }, { "PowerHint": "GAME", "Node": "VIRTUAL-SKIN-CPU-MID", diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 44cde33e..df6786c2 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -357,6 +357,31 @@ "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] } + ], + "Profile": [ + { + "Mode": "game", + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "BindedPowerRail": "S4M_VDD_CPUCL0", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-1", + "BindedPowerRail": "S2M_VDD_CPUCL1", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-2", + "BindedPowerRail": "S3M_VDD_CPUCL2", + "MaxReleaseStep": 1, + "Disabled":true + } + ] + } ] }, { diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 64b81829..d3f98c11 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -406,6 +406,31 @@ "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] } + ], + "Profile": [ + { + "Mode": "game", + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "BindedPowerRail": "S4M_VDD_CPUCL0", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-1", + "BindedPowerRail": "S2M_VDD_CPUCL1", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-2", + "BindedPowerRail": "S3M_VDD_CPUCL2", + "MaxReleaseStep": 1, + "Disabled":true + } + ] + } ] }, { diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index e670d745..71dd11a0 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -338,6 +338,31 @@ "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeiling": [0, 12, 12, 12, 12, 12, 12] } + ], + "Profile": [ + { + "Mode": "game", + "BindedCdevInfo": [ + { + "CdevRequest": "thermal-cpufreq-0", + "BindedPowerRail": "S4M_VDD_CPUCL0", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-1", + "BindedPowerRail": "S2M_VDD_CPUCL1", + "MaxReleaseStep": 1, + "Disabled":true + }, + { + "CdevRequest": "thermal-cpufreq-2", + "BindedPowerRail": "S3M_VDD_CPUCL2", + "MaxReleaseStep": 1, + "Disabled":true + } + ] + } ] }, {