From ceceadca8afef2502f8c061ee4bb38b6fa0ad13f Mon Sep 17 00:00:00 2001 From: Ravi Jain Date: Wed, 3 Jan 2024 02:23:05 +0000 Subject: [PATCH 1/4] dumpstate: touch: Init using touch_predump More info at go/touch_predump Test: Test locally on test device and check predump_touch works. Bug: 287907308 Change-Id: Ie08caa36bf58827db3d9fc0c820b0ad6880df664 Signed-off-by: Ravi Jain --- device-caiman.mk | 4 ++-- device-komodo.mk | 4 ++-- device-tokay.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index e0031eaf..77040845 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -48,8 +48,8 @@ include device/google/caimito/audio/caiman/audio-tables.mk include device/google/zumapro/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/gti/gti.mk -include device/google/gs-common/touch/syna/syna20.mk +include device/google/gs-common/touch/gti/predump_gti.mk +include device/google/gs-common/touch/syna/predump_syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk diff --git a/device-komodo.mk b/device-komodo.mk index a6f393d6..9de24aaa 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -48,8 +48,8 @@ include device/google/caimito/audio/komodo/audio-tables.mk include device/google/zumapro/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/gti/gti.mk -include device/google/gs-common/touch/syna/syna20.mk +include device/google/gs-common/touch/gti/predump_gti.mk +include device/google/gs-common/touch/syna/predump_syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk diff --git a/device-tokay.mk b/device-tokay.mk index b32dbdd5..c96a52e7 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -38,8 +38,8 @@ include device/google/caimito/audio/tokay/audio-tables.mk include device/google/zumapro/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/gti/gti.mk -include device/google/gs-common/touch/syna/syna20.mk +include device/google/gs-common/touch/gti/predump_gti.mk +include device/google/gs-common/touch/syna/predump_syna20.mk include device/google/caimito/fingerprint/ultrasonic_udfps.mk include device/google/gs-common/modem/radio_ext/radio_ext.mk include device/google/gs-common/pixelsupport/pixelsupport.mk From 7af485412521414a104672a46a851930ad708974 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Fri, 12 Apr 2024 17:55:06 +0000 Subject: [PATCH 2/4] Increase TAUClampBoost during capture to reduce latency Bug: 298227152 Test: 12mp: https://docs.google.com/spreadsheets/d/1LT4Nxiffr0V63SBEhdD3W7VXtaZGTEWT7vD70yio5Is/edit?resourcekey=0-eE7u5RnJP_E0hBZX8AO7BQ#gid=1777320174 Test: 50mp: https://docs.google.com/spreadsheets/d/1n0nnfl9W_m683SsjJuA5rpvcMVhn1uK1r38P8vgYfbQ/edit?resourcekey=0-nYeECKN1CTDFfsVhNn72cA#gid=1511403903 Change-Id: I632940ec5fe01cdd026c50960657142ea589d155 --- perf/powerhint-caiman.json | 7 +++++++ perf/powerhint-komodo.json | 7 +++++++ perf/powerhint-ripcurrentpro.json | 7 +++++++ perf/powerhint-tokay.json | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 013c870f..feeef821 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -259,6 +259,7 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", + "600", "1" ], "ResetOnInit": true @@ -1452,6 +1453,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "TAUClampBoost", + "Duration": 3000, + "Value": "600" + }, { "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", "Node": "CDPreferHighCap", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 77172983..38851a01 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -259,6 +259,7 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", + "600", "1" ], "ResetOnInit": true @@ -1452,6 +1453,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "TAUClampBoost", + "Duration": 3000, + "Value": "600" + }, { "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", "Node": "CDPreferHighCap", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index 99d9d979..ef57c4ee 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -312,6 +312,7 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", + "600", "1" ], "ResetOnInit": true @@ -1441,6 +1442,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "TAUClampBoost", + "Duration": 3000, + "Value": "600" + }, { "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", "Node": "CDPreferHighCap", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 013c870f..feeef821 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -259,6 +259,7 @@ "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", + "600", "1" ], "ResetOnInit": true @@ -1452,6 +1453,12 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE", + "Node": "TAUClampBoost", + "Duration": 3000, + "Value": "600" + }, { "PowerHint": "CAMERA_THERMAL_SEVERE_BOOST", "Node": "CDPreferHighCap", From d5db58d62821fbe2ab658bd1c0a9178aed5d25e0 Mon Sep 17 00:00:00 2001 From: "Ali K. Zadeh" Date: Fri, 12 Apr 2024 18:27:25 +0000 Subject: [PATCH 3/4] Increase SPC threshold for little and mid cores for CAMERA_STREAMING_STANDARD SPC threshold is too low for both Little and Mid cores. This CL increases this threshold to 55 for Little Core and to 30 for Mid core. Test results show lower framedrop rate in presence of background load, without having a negative impact on the power. Test: 1080p30: https://docs.google.com/spreadsheets/d/1ANQ7hCkvDR03vHVKfy_i8Eh2tyKEw2qpZmFktCACCgI/edit?resourcekey=0-JXymSV8n68bVlqG2B2MVOw#gid=839467803 Test: 4k30: https://docs.google.com/spreadsheets/d/1YBz9TahcF7iMLRC6iPCl-t_-Vx_Lu6qNTdrs_EmOvZk/edit?resourcekey=0-UarnZQ86b6Vt_LBBjeZQQg#gid=586707919 Test: 1080p120: https://docs.google.com/spreadsheets/d/1kgSEqpT24_qmMrIPGjUkxTVsqVZg5gJAWOCu7p2n02c/edit#gid=697949868 Test: Loaded: Spc Lit 55: https://docs.google.com/spreadsheets/d/1j3MBl0uyjQQmeqC-JN6pqDpYd9FI4UfQq8xXfJcwcis/edit?resourcekey=0-BsWXhyH5D6QJGU2nqfoi_Q#gid=1983120744 Test: Loaded: Spc Mid 30: 1080p30 https://docs.google.com/spreadsheets/d/1FeHEOp_XHM_NJdXeTgDi9VZY2Nql_44aJEvEVtCHWUQ/edit#gid=1505208441 Test: Loaded: Spc Mid 30: 4k30: https://docs.google.com/spreadsheets/d/137ltu2nq5aN-5gA7CxwrCVpUC3fLRE94D30hsaH0-SI/edit#gid=17725636 Bug: 304536786 Change-Id: I07c81d6c3297e54202dc8966b4306d77daf34447 --- perf/powerhint-caiman.json | 5 +++-- perf/powerhint-komodo.json | 5 +++-- perf/powerhint-ripcurrentpro.json | 5 +++-- perf/powerhint-tokay.json | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 9f76c720..21dfa891 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -614,6 +614,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "55", "42", "35", "30", @@ -2081,7 +2082,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "42" + "Value": "55" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2099,7 +2100,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "18" + "Value": "30" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 3178ba8b..8de64441 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -614,6 +614,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "55", "42", "35", "30", @@ -2081,7 +2082,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "42" + "Value": "55" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2099,7 +2100,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "18" + "Value": "30" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index ef57c4ee..d2984619 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -697,6 +697,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "55", "42", "35", "30", @@ -2070,7 +2071,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "42" + "Value": "55" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2088,7 +2089,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "18" + "Value": "30" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 9f76c720..21dfa891 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -614,6 +614,7 @@ "Path": "/sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold", "Values": [ "70", + "55", "42", "35", "30", @@ -2081,7 +2082,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_LIT_SPC_THRESHOLD", "Duration": 0, - "Value": "42" + "Value": "55" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", @@ -2099,7 +2100,7 @@ "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PMU_MID_SPC_THRESHOLD", "Duration": 0, - "Value": "18" + "Value": "30" }, { "PowerHint": "CAMERA_STREAMING_STANDARD", From 95f08c856ac0027d622a88ef4b684dfda59d502c Mon Sep 17 00:00:00 2001 From: guibing Date: Thu, 18 Apr 2024 22:12:04 +0000 Subject: [PATCH 4/4] adpf:caimito: update hboost jank check time factor. Update it to align with the HWUI target duration scale factor, so the adjusted jank check time duration is same as expected frame timeline's duration. HWUI target duration scale factor is 70%, and its inverse value is approximately 1.43. Bug: 204204746 Test: adb shell dumpsys android.hardware.power.IPower/default; Check the device adpf sessions' traces. Change-Id: Id835b30e7acd50b34840131669eaf3894ea5e629 --- perf/powerhint-caiman.json | 6 +++--- perf/powerhint-komodo.json | 6 +++--- perf/powerhint-tokay.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 91496adb..e0a16228 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -3170,7 +3170,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -3203,7 +3203,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -3236,7 +3236,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index dbe57195..4bdabccd 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -3170,7 +3170,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -3203,7 +3203,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -3236,7 +3236,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 91496adb..e0a16228 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -3170,7 +3170,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -3203,7 +3203,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 }, @@ -3236,7 +3236,7 @@ "HBoostOffMissedCycles": 5, "HBoostPidPuFactor": 0.5, "HBoostUclampMin": 722, - "JunkCheckTimeFactor": 1.2, + "JankCheckTimeFactor": 1.43, "LowFrameRateThreshold": 25, "MaxRecordsNum": 300 },