From 950d14c455acaa1c6c3508586142d092e04f728e Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Wed, 29 Sep 2021 14:45:05 +0000 Subject: [PATCH 1/6] gs101: move zram to pixel common mm folder Move zram settings to pixel common mm folder Bug: 200899926 Test: check swap size Signed-off-by: Martin Liu Change-Id: Ic81e26d706459e14029f611c03df4a14d4184277 --- conf/fstab.gs101.in | 1 - 1 file changed, 1 deletion(-) diff --git a/conf/fstab.gs101.in b/conf/fstab.gs101.in index 2481fbc6..a88d1cc1 100644 --- a/conf/fstab.gs101.in +++ b/conf/fstab.gs101.in @@ -19,5 +19,4 @@ vendor_dlkm /vendor_dlkm /dev/block/platform/14700000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount /dev/block/platform/14700000.ufs/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt,compress_extension=apk,compress_extension=apex,compress_extension=so,atgc,checkpoint_merge latemount,wait,check,quota,formattable,sysfs_path=/dev/sys/block/bootdevice,checkpoint=fs,reservedsize=128M,fileencryption=@fileencryption@,metadata_encryption=@metadata_encryption@,keydirectory=/metadata/vold/metadata_encryption,fscompress,readahead_size_kb=128 /dev/block/platform/14700000.ufs/by-name/vbmeta /vbmeta emmc defaults slotselect,first_stage_mount -/dev/block/zram0 none swap defaults zramsize=3221225472,max_comp_streams=8,zram_backingdev_size=512M /devices/platform/11110000.usb* auto vfat defaults voldmanaged=usb:auto From be546e636435d71331b99f703876bfd58cd730c0 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Thu, 30 Sep 2021 19:27:53 +0000 Subject: [PATCH 2/6] init.rc: Enable SOFT_OCP for TPU/CPU/GPU SOFT_OCR_WARN was disabled as part of b/199787970. This change reenables it Bug: 201551128 Test: build and boot on the device. Verify the sysfs entries cat /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x1 cat /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x1 cat /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x1 Change-Id: I366ddd43474d1a690aae5edb70b881c95e7b62d7 Signed-off-by: Sayanna Chandula --- conf/init.gs101.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index e12d4c66..b959d956 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -861,6 +861,9 @@ on property:vendor.thermal.link_ready=1 write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_cpu2_lvl 9000 write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_gpu_lvl 9000 write /sys/devices/virtual/pmic/mitigation/triggered_lvl/soft_ocp_tpu_lvl 8500 + write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x1 + write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x1 + write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x1 chown system system /dev/thermal/tz-by-name/soc/mode chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst From 0372678fe3be0aea968ca008fa460dc76afcaba9 Mon Sep 17 00:00:00 2001 From: chened Date: Thu, 30 Sep 2021 18:20:39 +0800 Subject: [PATCH 3/6] camera: disable saliency and segmentation for factory build Test: build pass, aosp camera Bug: 192660033 Change-Id: Ia5170e956b97dcab745231f0d5441a3511e7edf7 --- factory_common.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/factory_common.mk b/factory_common.mk index 0cc4fe30..5434fbf4 100644 --- a/factory_common.mk +++ b/factory_common.mk @@ -41,7 +41,9 @@ PRODUCT_PROPERTY_OVERRIDES += \ vendor.camera.debug.force_rectiface_node_on=0 \ vendor.camera.debug.force_steadiface_on=0 \ vendor.camera.debug.force_tnr_on=0 \ - vendor.camera.debug.local_tone_mapping_controller_v1.mode=0 + vendor.camera.debug.local_tone_mapping_controller_v1.mode=0 \ + vendor.camera.debug.force_segmentation_node_on=0 \ + vendor.camera.debug.enable_saliency=0 # Disable ScreenDecorations for factory builds PRODUCT_PROPERTY_OVERRIDES += \ From 093068d0dcdc5da399accdf8650c4cc52e986486 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Tue, 28 Sep 2021 07:38:00 -0700 Subject: [PATCH 4/6] powerhint: use DISPLAY_IDLE signal to control TA boost Add additional 200ms boost from DISPLAY_UPDATE_IMMINENT and INTERACTION. Bug: 199292504 Signed-off-by: Wei Wang Change-Id: I95d4d4f6f4763714d450eacdd63d0c5f724ac05a --- powerhint.json | 123 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 109 insertions(+), 14 deletions(-) diff --git a/powerhint.json b/powerhint.json index 7458d725..11e71cce 100644 --- a/powerhint.json +++ b/powerhint.json @@ -122,8 +122,10 @@ "Path": "/sys/kernel/vendor_sched/ta_uclamp_min", "Values": [ "553", + "158", + "108", + "43", "1", - "246", "157", "107", "42" @@ -390,11 +392,6 @@ "Duration": 5000, "Value": "9999999" }, - { - "PowerHint": "LAUNCH", - "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" - }, { "PowerHint": "LAUNCH", "Node": "CPULittleClusterMaxFreq", @@ -1014,15 +1011,103 @@ "Value": "1" }, { - "PowerHint": "DISABLE_TA_BOOST", + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "MaskHint", + "Value": "BOOST_DISPLAY" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "EndHint", + "Value": "BOOST_120HZ" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "EndHint", + "Value": "BOOST_90HZ" + }, + { + "PowerHint": "ADPF_DISABLE_TA_BOOST", + "Type": "EndHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "BOOST_DISPLAY", + "Type": "DoHint", + "Value": "BOOST_120HZ" + }, + { + "PowerHint": "BOOST_DISPLAY", + "Type": "DoHint", + "Value": "BOOST_90HZ" + }, + { + "PowerHint": "BOOST_DISPLAY", + "Type": "DoHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "INTERACTION", + "Type": "DoHint", + "Value": "BOOST_DISPLAY" + }, + { + "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "Type": "DoHint", + "Value": "BOOST_DISPLAY" + }, + { + "PowerHint": "BOOST_120HZ", "Node": "TAUClampBoost", - "Duration": 0, - "Value": "1" + "Duration": 200, + "Value": "158" + }, + { + "PowerHint": "BOOST_90HZ", + "Node": "TAUClampBoost", + "Duration": 200, + "Value": "108" + }, + { + "PowerHint": "BOOST_60HZ", + "Node": "TAUClampBoost", + "Duration": 200, + "Value": "43" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "REFRESH_120FPS", + "Type": "MaskHint", + "Value": "BOOST_90HZ" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "BOOST_120HZ" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "BOOST_90HZ" + }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "BOOST_120HZ" }, { "PowerHint": "DISPLAY_IDLE", - "Type": "DoHint", - "Value": "DISABLE_TA_BOOST" + "Node": "TAUClampBoost", + "Duration": 0, + "Value": "1" }, { "PowerHint": "DISPLAY_IDLE", @@ -1032,12 +1117,22 @@ { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", - "Value": "DISPLAY_UPDATE_IMMINENT" + "Value": "BOOST_120HZ" }, { - "PowerHint": "DISPLAY_UPDATE_IMMINENT", + "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", - "Value": "DISABLE_TA_BOOST" + "Value": "BOOST_90HZ" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "BOOST_60HZ" + }, + { + "PowerHint": "DISPLAY_IDLE", + "Type": "EndHint", + "Value": "DISPLAY_UPDATE_IMMINENT" }, { "PowerHint": "DISPLAY_UPDATE_IMMINENT", From 902e84ee68756328f2e7b71001717236fbcd1c23 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Mon, 13 Sep 2021 16:01:02 -0700 Subject: [PATCH 5/6] Boost SF higher for app launch Test: Build Bug: 199779453 Signed-off-by: Wei Wang Change-Id: Ide9ae93932c09fc1e5090981094d7d3935231e21 --- powerhint.json | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/powerhint.json b/powerhint.json index 11e71cce..3e9d38b9 100644 --- a/powerhint.json +++ b/powerhint.json @@ -137,6 +137,7 @@ "Name": "SFUClampBoost", "Path": "/sys/kernel/vendor_sched/sf_uclamp_min", "Values": [ + "125", "65", "30" ], @@ -386,6 +387,23 @@ "Duration": 0, "Value": "2" }, + { + "PowerHint": "LAUNCH_120FPS", + "Node": "SFUClampBoost", + "Duration": 1000, + "Value": "125" + }, + { + "PowerHint": "LAUNCH", + "Type": "DoHint", + "Value": "LAUNCH_120FPS" + }, + { + "PowerHint": "LAUNCH", + "Node": "SFUClampBoost", + "Duration": 5000, + "Value": "65" + }, { "PowerHint": "LAUNCH", "Node": "CPUMidClusterMaxFreq", @@ -998,12 +1016,22 @@ "Duration": 0, "Value": "107" }, + { + "PowerHint": "REFRESH_90FPS", + "Type": "MaskHint", + "Value": "LAUNCH_120FPS" + }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, "Value": "42" }, + { + "PowerHint": "REFRESH_60FPS", + "Type": "MaskHint", + "Value": "LAUNCH_120FPS" + }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", "Node": "TAUClampBoost", From 6896836e0ece2a73a982381d7c57bd6635ff1c3b Mon Sep 17 00:00:00 2001 From: Max Kogan Date: Thu, 23 Sep 2021 17:48:19 -0700 Subject: [PATCH 6/6] dumpstate: dump AoC memory votes stats Bug: 198203507 Test: adb bugreport, open Bug Sections "dumpstate_board.txt" Test: search for "AoC memory votes" Change-Id: I24d80a6e3493ccc961b8eed3b9da4b9dfbbf457f --- dumpstate/DumpstateDevice.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 3da1d3ce..7eadb045 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -901,6 +901,7 @@ void DumpstateDevice::dumpAoCSection(int fd) { DumpFileToFd(fd, "AoC logging wake", "/sys/devices/platform/19000000.aoc/control/logging_wakeup"); DumpFileToFd(fd, "AoC hotword wake", "/sys/devices/platform/19000000.aoc/control/hotword_wakeup"); DumpFileToFd(fd, "AoC memory exception wake", "/sys/devices/platform/19000000.aoc/control/memory_exception"); + DumpFileToFd(fd, "AoC memory votes", "/sys/devices/platform/19000000.aoc/control/memory_votes"); } // Dump items related to sensors usf.