Merge ab/AP4A.241205.013 into aosp-main-future

Bug: 370570306
Merged-In: Id4c40653d9ac2329a2d673830755e5620ff90223
Change-Id: I3308d86fbbb2a2ddb5ecf0f27251ec8a99377ad4
This commit is contained in:
Xin Li 2024-11-27 12:53:10 -08:00
commit fb47a6e35e
3 changed files with 25 additions and 9 deletions

View file

@ -29,6 +29,7 @@ Chip_Configuration_DCXO_CrystalType=0x11
Chip_Configuration_GNSSConstConstraintDef = 0x60FF
LocTech_Constraints = 0x60FF
Chip_Configuration_RfMiscCtrl = 0x80008001
Chip_Configuration_ntn_option=2
bdsUsedInUSPolicy=2
sbasUsedInUSPolicy=2
qzssUsedInUSPolicy=2

View file

@ -115,6 +115,11 @@ Chip_Configuration_RfMiscCtrl = 0x80008001
#Chip_Configuration_RfMiscCtrl=0x8001
#Chip_Configuration_IspTestConfig=0x22242822
#Chip_Configuration_ntn_option=0 means no NTN blackout IPC handling
#Chip_Configuration_ntn_option=1 means L1 blanking during NTN blackout period.
#Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period.
Chip_Configuration_ntn_option=2
# Disable BDS in the U.S.
# 0-enabled (default), 1-disabled, 2-auto(disabled in US)
#gloUsedInUSPolicy=2
@ -127,7 +132,7 @@ navicUsedInUSPolicy=2
# DFS: 0 = Disabled, 1 = Enabled (default)
Chip_Configuration_FeatureCfg_DVS = 1
Chip_Configuration_FeatureCfg_DFS = 1
# Disable MTPL
# MTPL: 0 = Disabled, 1 = Enabled
Chip_Configuration_FeatureCfg_MTPL = 1
# MCW Link failure behavior: 0 = SW Assert (default), 1 = GNSS restart (hot start)
Chip_Configuration_FeatureCfg_SDL_BYASS = 1

View file

@ -3262,7 +3262,7 @@
"PowerHint": "GAME",
"Node": "AutoPreferIdle",
"Duration": 0,
"Value": "0"
"Value": "1"
},
{
"PowerHint": "GAME",
@ -3583,12 +3583,13 @@
"Value": "20 80"
}
],
"GpuSysfsPath" : "/sys/devices/platform/1f000000.mali",
"AdpfConfig": [
{
"Name": "REFRESH_120FPS",
"PID_On": true,
"PID_Po": 2.0,
"PID_Pu": 1.0,
"PID_Pu": 0.6,
"PID_I": 0.0,
"PID_I_Init": 200,
"PID_I_High": 512,
@ -3618,7 +3619,9 @@
"HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
"MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 40000
},
{
"Name": "REFRESH_90FPS",
@ -3654,7 +3657,9 @@
"HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
"MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 32500
},
{
"Name": "REFRESH_60FPS",
@ -3690,7 +3695,9 @@
"HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
"MaxRecordsNum": 300,
"GpuBoost": true,
"GpuCapacityBoostMax": 25000
},
{
"Name": "UiHighBoostWithoutPid",
@ -3714,7 +3721,8 @@
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowBoostWithoutPid",
@ -3738,7 +3746,8 @@
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
"StaleTimeFactor": 5.0,
"GpuBoost": false
},
{
"Name": "UiLowNoneBoost",
@ -3762,7 +3771,8 @@
"UclampMax_EfficientOffset": 200,
"ReportingRateLimitNs": 1,
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 5.0
"StaleTimeFactor": 5.0,
"GpuBoost": false
}
]
}