Evolution-X-Tensor/device_google_zumapro
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future

Browse source 
Bug: 347831320
Merged-In: I2cdbd8126e5684891b6424d262aa505d2aa641b7
Change-Id: I3d373b5ad4ed46fb09268ca62785f68037680773
This commit is contained in:
Xin Li 2024-08-08 11:16:10 -07:00
commit c000a16b45
6 changed files with 68 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
conf/init.zumapro.board.rc
View file

@ -408,6 +408,7 @@ on fs
chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_rate_hz chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_rate_hz
chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_option chown system system /sys/devices/platform/exynos-drm/primary-panel/te2_option
chown system system /sys/devices/platform/exynos-drm/primary-panel/power_state chown system system /sys/devices/platform/exynos-drm/primary-panel/power_state
chown system system /sys/devices/platform/exynos-drm/primary-panel/frame_rate
chown system system /sys/module/drm/parameters/vblankoffdelay chown system system /sys/module/drm/parameters/vblankoffdelay
chown system system /sys/module/drm/parameters/debug chown system system /sys/module/drm/parameters/debug
chown system system /sys/class/dqe0/atc/ambient_light chown system system /sys/class/dqe0/atc/ambient_light

21
conf/init.zumapro.soc.rc
View file

@ -28,17 +28,30 @@ on init
write /proc/vendor_sched/groups/sys/uclamp_min 190 write /proc/vendor_sched/groups/sys/uclamp_min 190
write /proc/vendor_sched/groups/sys/prefer_idle 1 write /proc/vendor_sched/groups/sys/prefer_idle 1
write /proc/vendor_sched/groups/bg/rampup_multiplier 0
write /proc/vendor_sched/groups/cam/rampup_multiplier 1
write /proc/vendor_sched/groups/cam_power/rampup_multiplier 1
write /proc/vendor_sched/groups/dex2oat/rampup_multiplier 0
write /proc/vendor_sched/groups/fg/rampup_multiplier 0
write /proc/vendor_sched/groups/nnapi/rampup_multiplier 0
write /proc/vendor_sched/groups/ota/rampup_multiplier 0
write /proc/vendor_sched/groups/rt/rampup_multiplier 0
write /proc/vendor_sched/groups/sf/rampup_multiplier 1
write /proc/vendor_sched/groups/sys/rampup_multiplier 0
write /proc/vendor_sched/groups/sys_bg/rampup_multiplier 0
write /proc/vendor_sched/groups/ta/rampup_multiplier 1
write /proc/vendor_sched/adpf_rampup_multiplier 2
# governor setting # governor setting
write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor sched_pixel
write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/up_rate_limit_us 500 write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/up_rate_limit_us 500
write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 5000 write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_us 500
write /sys/devices/system/cpu/cpu0/cpufreq/sched_pixel/down_rate_limit_scale_pow 2
write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor sched_pixel write /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor sched_pixel
write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/up_rate_limit_us 500 write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/up_rate_limit_us 500
write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 20000 write /sys/devices/system/cpu/cpu4/cpufreq/sched_pixel/down_rate_limit_us 500
write /sys/devices/system/cpu/cpu7/cpufreq/scaling_governor sched_pixel write /sys/devices/system/cpu/cpu7/cpufreq/scaling_governor sched_pixel
write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/up_rate_limit_us 500 write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/up_rate_limit_us 500
write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/down_rate_limit_us 20000 write /sys/devices/system/cpu/cpu7/cpufreq/sched_pixel/down_rate_limit_us 500
# memlat cpuidle awareness setting # memlat cpuidle awareness setting
# FIXME(b/301212469) these nodes missing on zuma pro # FIXME(b/301212469) these nodes missing on zuma pro

36
device.mk
View file

@ -26,6 +26,7 @@ include device/google/gs-common/storage/storage.mk
include device/google/gs-common/thermal/dump/thermal.mk include device/google/gs-common/thermal/dump/thermal.mk
include device/google/gs-common/thermal/thermal_hal/device.mk include device/google/gs-common/thermal/thermal_hal/device.mk
include device/google/gs-common/performance/perf.mk include device/google/gs-common/performance/perf.mk
include device/google/gs-common/power/power.mk
include device/google/gs-common/pixel_metrics/pixel_metrics.mk include device/google/gs-common/pixel_metrics/pixel_metrics.mk
include device/google/gs-common/soc/freq.mk include device/google/gs-common/soc/freq.mk
include device/google/gs-common/gps/dump/log.mk include device/google/gs-common/gps/dump/log.mk
@ -227,21 +228,18 @@ $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHA
# modem_ml_svc_sit daemon # modem_ml_svc_sit daemon
PRODUCT_PACKAGES += modem_ml_svc_sit PRODUCT_PACKAGES += modem_ml_svc_sit
ifeq (,$(filter aosp_%,$(TARGET_PRODUCT))) # TODO: b/350624523 - Add back modem ML TFLite service after it is ready.
# Modem ML TFLite service. # ifeq (,$(filter aosp_%,$(TARGET_PRODUCT)))
PRODUCT_PACKAGES += modemml-tflite-service \ # # Modem ML TFLite service.
libtensorflowlite_jni # PRODUCT_PACKAGES += modemml-tflite-service \
# libtensorflowlite_jni
# Allow TFLite service modules to be installed to the system partition # # Allow TFLite service modules to be installed to the system partition
PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \ # PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/etc/vintf/manifest/modemml_tflite_service.xml \ # system/lib64/libtensorflowlite_jni.so
system/framework/modemml-tflite-service.jar \
system/framework/oat/arm64/modemml-tflite-service.odex \
system/framework/oat/arm64/modemml-tflite-service.vdex \
system/lib64/libtensorflowlite_jni.so
PRODUCT_SYSTEM_SERVER_JARS += modemml-tflite-service # PRODUCT_SYSTEM_SERVER_JARS += system_ext:modemml-tflite-service
endif # endif
# modem ML models configs # modem ML models configs
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
@ -277,11 +275,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Pixel Logger # Pixel Logger
include hardware/google/pixel/PixelLogger/PixelLogger.mk include hardware/google/pixel/PixelLogger/PixelLogger.mk
# RIL extension service
ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT)))
include device/google/gs-common/pixel_ril/ril.mk
endif
# Use Lassen specifc Shared Modem Platform # Use Lassen specifc Shared Modem Platform
SHARED_MODEM_PLATFORM_VENDOR := lassen SHARED_MODEM_PLATFORM_VENDOR := lassen
@ -1209,6 +1202,13 @@ include hardware/google/pixel/HardwareInfo/HardwareInfo.mk
# UFS: the script is used to select the corresponding firmware to run FFU. # UFS: the script is used to select the corresponding firmware to run FFU.
PRODUCT_PACKAGES_DEBUG += ufs_firmware_update.sh PRODUCT_PACKAGES_DEBUG += ufs_firmware_update.sh
ifneq ($(BOARD_WITHOUT_RADIO),true)
# RIL extension service
ifeq (,$(filter aosp_% factory_%,$(TARGET_PRODUCT)))
include device/google/gs-common/pixel_ril/ril.mk
endif
endif
SUPPORT_VENDOR_SATELLITE_SERVICE := true SUPPORT_VENDOR_SATELLITE_SERVICE := true
# Telephony satellite geofence data file # Telephony satellite geofence data file

14
media_codecs_performance_c2.xml
View file

@ -115,13 +115,13 @@
</MediaCodec> </MediaCodec>
<MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true"> <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
<!-- measured 90%:342-360 med:343 N=2 --> <!-- measured 90%:342-360 med:343 N=2 -->
<Limit name="measured-frame-rate-320x240" range="342-351" /> <!-- v90%=1.0 --> <Limit name="measured-frame-rate-320x240" range="291-512" /> <!-- v90%=1.0 -->
<!-- measured 90%:142-147 med:143 N=2 --> <!-- measured 90%:142-147 med:143 N=2 -->
<Limit name="measured-frame-rate-720x480" range="142-145" /> <!-- v90%=1.0 --> <Limit name="measured-frame-rate-720x480" range="244-474" /> <!-- v90%=1.0 -->
<!-- measured 90%:54-56 med:55 N=2 --> <!-- measured 90%:54-56 med:55 N=2 -->
<Limit name="measured-frame-rate-1280x720" range="54-55" /> <!-- v90%=1.0 --> <Limit name="measured-frame-rate-1280x720" range="110-209" /> <!-- v90%=1.0 -->
<!-- measured 90%:25-26 med:26 N=2 --> <!-- measured 90%:25-26 med:26 N=2 -->
<Limit name="measured-frame-rate-1920x1080" range="25-26" /> <!-- v90%=1.0 --> <Limit name="measured-frame-rate-1920x1080" range="45-87" /> <!-- v90%=1.0 -->
</MediaCodec> </MediaCodec>
<MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true"> <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
<Limit name="measured-frame-rate-352x288" range="549-674" /> <Limit name="measured-frame-rate-352x288" range="549-674" />
@ -135,9 +135,9 @@
<Limit name="measured-frame-rate-1920x1080" range="45-70" /> <!-- v90%=1.0 --> <Limit name="measured-frame-rate-1920x1080" range="45-70" /> <!-- v90%=1.0 -->
</MediaCodec> </MediaCodec>
<MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true"> <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
<Limit name="measured-frame-rate-176x144" range="1111-1176" /> <Limit name="measured-frame-rate-176x144" range="1111-1591" />
<Limit name="measured-frame-rate-480x360" range="964-1042" /> <Limit name="measured-frame-rate-480x360" range="964-1411" />
<Limit name="measured-frame-rate-1280x720" range="294-300" /> <Limit name="measured-frame-rate-1280x720" range="390-740" />
</MediaCodec> </MediaCodec>
<MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true"> <MediaCodec name="c2.android.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x180" range="445-630" /> <Limit name="measured-frame-rate-320x180" range="445-630" />

5
overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -304,9 +304,10 @@
<!-- Class names of device-specific services inheriting com.android.server.SystemService. The <!-- Class names of device-specific services inheriting com.android.server.SystemService. The
classes are instantiated in the order of the array. --> classes are instantiated in the order of the array. -->
<string-array translatable="false" name="config_deviceSpecificSystemServices"> <!-- TODO: b/350624523 - Add back modem ML TFLite service after it is ready. -->
<!-- <string-array translatable="false" name="config_deviceSpecificSystemServices">
<item>com.android.server.modemml.TFLiteService</item> <item>com.android.server.modemml.TFLiteService</item>
</string-array> </string-array> -->
<!-- Pre-scale volume at volume step 1 for Absolute Volume --> <!-- Pre-scale volume at volume step 1 for Absolute Volume -->
<fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction> <fraction name="config_prescaleAbsoluteVolume_index1">100%</fraction>

22
overlay/packages/apps/Settings/res/values/arrays.xml Normal file
View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2024 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources>
<!-- Packages that will not show Display over other apps permission -->
<string-array name="display_over_apps_permission_change_exempt">
<item>com.google.android.apps.scone</item>
</string-array>
</resources>