From 76272091c84ff879a78b288600cb4e7546d9cdb1 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Tue, 28 Feb 2023 09:55:08 -0800 Subject: [PATCH 1/5] zuma: conf: set gsa log group to system dumpstate runs as system group, so in order to prepare for it to be readable by dumpstate, we need to change the group to system. (cherry picked from commit 286ebed626a73d879fe37f2771a303310d040a43) Bug: 271125313 Test: ls -l /sys/devices/platform/16490000.gsa-ns/ Change-Id: Ib8f299e99add9cc2f03887cda78f576924c522cd Merged-In: Ib8f299e99add9cc2f03887cda78f576924c522cd --- conf/init.zuma.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index 2ffbd86a..fe6ded61 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -365,6 +365,10 @@ on init chown system system /sys/devices/platform/13120000.pcie/link_stats/link_recovery_failures chown system system /sys/devices/platform/13120000.pcie/link_stats/link_up_failures + # Change GSA log group for dumpstate + chown root system /sys/devices/platform/16490000.gsa-ns/log_main + chown root system /sys/devices/platform/16490000.gsa-ns/log_intermediate + on post-fs # Ensure device is ready and start storageproxyd wait /dev/sg1 From 3ba817ae3f587687a0a1934b65ab8f804db1f977 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Mon, 27 Feb 2023 14:23:00 -0800 Subject: [PATCH 2/5] dumpstate: add GSA logs to bugreport Add support for reading the GSA logs sysfs file to see the GSA logs in the bugreports we get from dogfooders. (cherry picked from commit 09cb4227bb313274e46b973024ed3820319778e1) Bug: 271125313 Test: adb shell dumpstate Change-Id: I09a2e039451b5eb8b7fa360ba03486bd871fb970 Merged-In: I09a2e039451b5eb8b7fa360ba03486bd871fb970 --- dumpstate/Android.bp | 6 ++++++ dumpstate/dump_gsa.sh | 8 ++++++++ dumpstate/item.mk | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 dumpstate/dump_gsa.sh diff --git a/dumpstate/Android.bp b/dumpstate/Android.bp index 7494e694..d5ec7add 100644 --- a/dumpstate/Android.bp +++ b/dumpstate/Android.bp @@ -23,3 +23,9 @@ sh_binary { sub_dir: "dump", } +sh_binary { + name: "dump_gsa.sh", + src: "dump_gsa.sh", + vendor: true, + sub_dir: "dump", +} diff --git a/dumpstate/dump_gsa.sh b/dumpstate/dump_gsa.sh new file mode 100644 index 00000000..a0d42324 --- /dev/null +++ b/dumpstate/dump_gsa.sh @@ -0,0 +1,8 @@ +#!/vendor/bin/sh + +echo "--- GSA MAIN LOG" +cat /sys/devices/platform/16490000.gsa-ns/log_main + +echo "--- GSA INTERMEDIATE LOG" +cat /sys/devices/platform/16490000.gsa-ns/log_intermediate + diff --git a/dumpstate/item.mk b/dumpstate/item.mk index 00ef3e6d..124fd1c2 100644 --- a/dumpstate/item.mk +++ b/dumpstate/item.mk @@ -1,5 +1,6 @@ PRODUCT_PACKAGES += dump_wlan.sh \ dump_power.sh -PRODUCT_PACKAGES_DEBUG += dump_cma.sh +PRODUCT_PACKAGES_DEBUG += dump_cma.sh \ + dump_gsa.sh From d23e85dd357ed9152db43d4f98ba69ad447af19d Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Mon, 24 Apr 2023 17:35:39 +0800 Subject: [PATCH 3/5] Upgrade VINTF Target FCM level from 7 to 8 Target FCM level 8 requires the newer version of the following HALs: android.hardware.boot android.hardware.neuralnetworks android.hardware.cas Add the older version of these HALs into the customized product FCM Remove below from customized product FCM and follow general rule: android.hardware.biometrics.face android.hardware.radio.config Bug: 277188108 Change-Id: Iaec28d5ca254029daf126393e77fa997a8c6ce92 --- device_framework_matrix_product.xml | 32 +++++++++++++++-------------- manifest.xml | 2 +- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 811c2885..749d6daa 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,15 +1,17 @@ - - - android.hardware.biometrics.face + + + android.hardware.boot + 1.2 - IFace + IBootControl default - - android.hardware.biometrics.fingerprint + + android.hardware.cas + 1.2 - IFingerprint + IMediaCasService default @@ -29,6 +31,14 @@ default + + android.hardware.neuralnetworks + 1.3 + + IDevice + google-armnn + + android.hardware.radio 1.2 @@ -37,14 +47,6 @@ slot2 - - android.hardware.radio.config - 1.1 - - IRadioConfig - default - - android.hardware.vibrator 2 diff --git a/manifest.xml b/manifest.xml index fcc6aae0..e5678026 100644 --- a/manifest.xml +++ b/manifest.xml @@ -1,4 +1,4 @@ - + android.hardware.graphics.mapper passthrough From fdc3c0db4882f11e581b7dd0dc19423b32d1b942 Mon Sep 17 00:00:00 2001 From: Kris Chen Date: Sat, 20 May 2023 00:21:13 +0800 Subject: [PATCH 4/5] Configure udfps sysfs node permissions in ueventd.*.rc Bug: 282568738 Test: Trigger aoc crash, perform udfps osc calibration. Change-Id: I6d488c6808903eb5eeb6a3aa8336968ae9c643d3 --- conf/init.zuma.rc | 8 -------- conf/ueventd.zuma.rc | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc index bd51a33f..409fc2ea 100644 --- a/conf/init.zuma.rc +++ b/conf/init.zuma.rc @@ -840,14 +840,6 @@ on property:sys.boot_completed=1 chown root system /sys/devices/platform/19000000.aoc/reset chmod 0220 /sys/devices/platform/19000000.aoc/reset - # AOC UDFPS clock compensation permission - chown system system /sys/devices/platform/17000000.aoc/control/udfps_set_clock_source - chmod 220 /sys/devices/platform/17000000.aoc/control/udfps_set_clock_source - chown system system /sys/devices/platform/17000000.aoc/control/udfps_get_osc_freq - chmod 440 /sys/devices/platform/17000000.aoc/control/udfps_get_osc_freq - chown system system /sys/devices/platform/17000000.aoc/control/udfps_get_disp_freq - chmod 440 /sys/devices/platform/17000000.aoc/control/udfps_get_disp_freq - # write serialno to battery path for pairing write /sys/class/power_supply/battery/dev_sn ${ro.boot.serialno} diff --git a/conf/ueventd.zuma.rc b/conf/ueventd.zuma.rc index 7483184a..c3a57cba 100644 --- a/conf/ueventd.zuma.rc +++ b/conf/ueventd.zuma.rc @@ -227,3 +227,8 @@ # Wlan /dev/wlan 0660 wifi wifi + +# Udfps +/sys/bus/aoc/devices/control udfps_set_clock_source 0220 system system +/sys/bus/aoc/devices/control udfps_get_osc_freq 0440 system system +/sys/bus/aoc/devices/control udfps_get_disp_freq 0440 system system From e26f16f363360f92946c3b0acba7c7eb4ad2baeb Mon Sep 17 00:00:00 2001 From: Midas Chien Date: Mon, 22 May 2023 08:05:17 +0000 Subject: [PATCH 5/5] display: extend DPP downscale ratio Extend DPP downscale ratio to allow DPU to handle more downscale scenarios. Bug: 279671862 Test: play various resoltuion videos Test: simulate several downscale ratio layers Change-Id: I724aab35d07016a718a1b985ae96cb0471dbe912 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 4b9e6005..916cb10e 100644 --- a/device.mk +++ b/device.mk @@ -698,7 +698,7 @@ PRODUCT_COPY_FILES += \ device/google/zuma/display/display_colordata_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_cal0.pb # limit DPP downscale ratio -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.hwc.dpp.downscale=2 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.hwc.dpp.downscale=3 # Cannot reference variables defined in BoardConfig.mk, uncomment this if # BOARD_USES_EXYNOS_DSS_FEATURE is true