From f669d8b42e63057f2e3e7185ee9664a44ff90660 Mon Sep 17 00:00:00 2001 From: William Tai Date: Sat, 16 Apr 2022 09:20:33 +0800 Subject: [PATCH 1/4] display: add primary display LHBM property Add primary display LHBM frames to reach peak brightness property. Bug: 224573604 Test: perfetto Change-Id: I55b85dff319fa95be6ee33c7286eca1c0a042407 --- device-cheetah.mk | 3 +++ device-panther.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/device-cheetah.mk b/device-cheetah.mk index 9fe0aec..de791e5 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -79,6 +79,9 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 #config of display brightness dimming PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.brightness.dimming.usage=1 +#config of primary display frames to reach LHBM peak brightness +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach_peak_brightness=2 + # NFC PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ diff --git a/device-panther.mk b/device-panther.mk index f390c44..e389f17 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -64,6 +64,9 @@ PRODUCT_COPY_FILES += \ # Display LBE PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 +#config of primary display frames to reach LHBM peak brightness +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach_peak_brightness=2 + # NFC PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ From 2f6ddb4ed3d5b68a73b08c7f94dd84099562a5e6 Mon Sep 17 00:00:00 2001 From: Kris Chen Date: Tue, 19 Apr 2022 20:43:35 +0800 Subject: [PATCH 2/4] c10p10: Enable LHBM control from UDFPS HAL Bug: 229716695 Bug: 224573604 Test: build and test fingerprint on device. Change-Id: I8e3945bc8c99aae024f0304912419ce0d2820de3 --- device-cheetah.mk | 5 +++-- device-panther.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index de791e5..8f9ef56 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -254,9 +254,10 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) device/google/gs201/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc endif -# Fingerprint als feed forward +# Fingerprint HAL PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.udfps.als_feed_forward_supported=true + persist.vendor.udfps.als_feed_forward_supported=true \ + persist.vendor.udfps.lhbm_controlled_in_hal_supported=true # Vibrator HAL PRODUCT_VENDOR_PROPERTIES += \ diff --git a/device-panther.mk b/device-panther.mk index e389f17..ae0d1b5 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -244,9 +244,10 @@ ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) device/google/gs201/init.hardware.wlc.rc.userdebug:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.wlc.rc endif -# Fingerprint als feed forward +# Fingerprint HAL PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.udfps.als_feed_forward_supported=true + persist.vendor.udfps.als_feed_forward_supported=true \ + persist.vendor.udfps.lhbm_controlled_in_hal_supported=true # Vibrator HAL PRODUCT_VENDOR_PROPERTIES += \ From 53a6f56c3187132025b711f56d843081247b743d Mon Sep 17 00:00:00 2001 From: samou Date: Mon, 25 Apr 2022 09:03:04 +0000 Subject: [PATCH 3/4] power_profile: Correct CPU topology and update power number Bug: 219870109 Signed-off-by: samou Change-Id: I45b40c4f2f1942d7246d5dbc5fdb237a6ecc571c --- .../base/core/res/res/xml/power_profile.xml | 111 ++++++++--------- .../base/core/res/res/xml/power_profile.xml | 113 +++++++++--------- 2 files changed, 107 insertions(+), 117 deletions(-) diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 476ba4e..68584f6 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -25,16 +25,15 @@ 2 - - 10 - 28.6 - 12.37 - 0.24 - 3.23 - 5.94 + 13.3 + 35.6 + 8.2 + 0 + 1.16 + 1.53 + /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies --> 300000 574000 @@ -47,12 +46,10 @@ 1598000 1704000 1803000 - 1950000 - 2024000 + /sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies --> 400000 553000 @@ -72,7 +69,7 @@ + /sys/devices/system/cpu/cpufreq/policy6/scaling_available_frequencies --> 500000 851000 @@ -97,62 +94,60 @@ - 1.89 - 6.15 - 9.34 - 14.22 - 18.94 - 21.98 - 26.83 - 30.17 - 41.55 - 48.36 - 58.45 - 73 - 80 + 4.71 + 10.24 + 13.43 + 17.54 + 20.79 + 22.82 + 25.55 + 27.03 + 38.2 + 46.69 + 60.01 - 3.71 - 6.16 - 8 - 10.94 - 12.73 - 14.4 - 21.39 - 24.1 - 30.42 - 42.49 - 49.37 - 58.09 - 67.54 - 79.04 - 87 + 8.03 + 9.37 + 11.14 + 12.65 + 14.5 + 16.33 + 19.81 + 22.79 + 27.68 + 33.78 + 40.65 + 49.57 + 59.19 + 70.22 + 81 - 8.36 - 16.33 - 19.44 - 36.71 - 41.42 - 48.24 - 54.77 - 65.32 - 69.58 - 128.49 - 142.15 - 149.74 - 164.78 - 188.68 - 193.15 - 227.98 - 254.25 - 267 + 13.16 + 19.29 + 22.53 + 26.11 + 31.73 + 38.12 + 45.44 + 53.15 + 57.1 + 71.92 + 83.89 + 90.36 + 108.58 + 129.22 + 147.88 + 164.96 + 188.15 + 202.77 diff --git a/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml index 3322606..f84c9bd 100644 --- a/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml +++ b/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml @@ -17,7 +17,7 @@ */ --> - 4315 + 4356 4 @@ -25,16 +25,15 @@ 2 - - 10 - 28.6 - 12.37 - 0.24 - 3.23 - 5.94 + 13.3 + 35.6 + 8.2 + 0 + 1.16 + 1.53 + /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies --> 300000 574000 @@ -47,12 +46,10 @@ 1598000 1704000 1803000 - 1950000 - 2024000 + /sys/devices/system/cpu/cpufreq/policy4/scaling_available_frequencies --> 400000 553000 @@ -72,7 +69,7 @@ + /sys/devices/system/cpu/cpufreq/policy6/scaling_available_frequencies --> 500000 851000 @@ -97,62 +94,60 @@ - 1.89 - 6.15 - 9.34 - 14.22 - 18.94 - 21.98 - 26.83 - 30.17 - 41.55 - 48.36 - 58.45 - 73 - 80 + 4.71 + 10.24 + 13.43 + 17.54 + 20.79 + 22.82 + 25.55 + 27.03 + 38.2 + 46.69 + 60.01 - 3.71 - 6.16 - 8 - 10.94 - 12.73 - 14.4 - 21.39 - 24.1 - 30.42 - 42.49 - 49.37 - 58.09 - 67.54 - 79.04 - 87 + 8.03 + 9.37 + 11.14 + 12.65 + 14.5 + 16.33 + 19.81 + 22.79 + 27.68 + 33.78 + 40.65 + 49.57 + 59.19 + 70.22 + 81 - 8.36 - 16.33 - 19.44 - 36.71 - 41.42 - 48.24 - 54.77 - 65.32 - 69.58 - 128.49 - 142.15 - 149.74 - 164.78 - 188.68 - 193.15 - 227.98 - 254.25 - 267 + 13.16 + 19.29 + 22.53 + 26.11 + 31.73 + 38.12 + 45.44 + 53.15 + 57.1 + 71.92 + 83.89 + 90.36 + 108.58 + 129.22 + 147.88 + 164.96 + 188.15 + 202.77 From 72652908ce0ad5c5eda0ac75123ea47e9450ba70 Mon Sep 17 00:00:00 2001 From: Isaac Chiou Date: Fri, 29 Apr 2022 15:57:26 +0800 Subject: [PATCH 4/4] Remove PixelWifiOverlay2022 from factory build With PixelWifiOverlay2022 in factory build, the overlays can be loaded properly. Remove PixelWifiOverlay2022 and only add for normal build. Test: overlays can be read properly in both normal and factory build Bug: 228415213 Change-Id: I1ac9d8c020c6030e8a6f9759ae761e342adc956f --- device-cheetah.mk | 3 +-- device-panther.mk | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/device-cheetah.mk b/device-cheetah.mk index 8f9ef56..01439b0 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -194,8 +194,7 @@ endif # WiFi Overlay PRODUCT_PACKAGES += \ - WifiOverlay2022_C10 \ - PixelWifiOverlay2022_C10 + WifiOverlay2022_C10 PRODUCT_SOONG_NAMESPACES += device/google/pantah/cheetah/ diff --git a/device-panther.mk b/device-panther.mk index ae0d1b5..0ec7270 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -183,8 +183,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layer # WiFi Overlay PRODUCT_PACKAGES += \ - WifiOverlay2022_P10 \ - PixelWifiOverlay2022_P10 + WifiOverlay2022_P10 PRODUCT_SOONG_NAMESPACES += device/google/pantah/panther/