From 9adc062bcc1ed44c61f79329a2e5615572e376fc Mon Sep 17 00:00:00 2001 From: Robin Hsu Date: Wed, 16 Feb 2022 21:15:10 +0800 Subject: [PATCH 1/3] config.xml: max_cached_processes changed to 64 Bug: 190531672 Test: dumpsys activity -i | grep -i cached_process Signed-off-by: Robin Hsu Change-Id: I3cf8989a398ea594187b0e5a8cc8bad315b78ac3 --- cheetah/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ panther/overlay/frameworks/base/core/res/res/values/config.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index 2c82b65..faad22c 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -150,4 +150,7 @@ com.google.sensor.long_press + + + 64 diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index ee6c6bb..dc57f3e 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -149,4 +149,7 @@ com.google.sensor.long_press + + + 64 From e6f34d946a9aa41921e5871652fc335f205b1df1 Mon Sep 17 00:00:00 2001 From: Tai Kuo Date: Wed, 16 Feb 2022 18:56:52 +0800 Subject: [PATCH 2/3] haptics: enable hapitcs sink and slot setting Bug: 199578214 Test: trigger audio coupled haptics via sound picker app Change-Id: I2c20f75d5df59e5d72800878c76c5ad3c1709079 --- .../config/audio_policy_configuration.xml | 26 +++++++++---------- ...cy_configuration_a2dp_offload_disabled.xml | 20 +++++++------- ...icy_configuration_bluetooth_legacy_hal.xml | 20 +++++++------- audio/cheetah/config/mixer_paths.xml | 1 + .../config/audio_policy_configuration.xml | 26 +++++++++---------- ...cy_configuration_a2dp_offload_disabled.xml | 20 +++++++------- ...icy_configuration_bluetooth_legacy_hal.xml | 20 +++++++------- audio/panther/config/mixer_paths.xml | 1 + init.insmod.cheetah.cfg | 2 ++ init.insmod.panther.cfg | 2 ++ 10 files changed, 72 insertions(+), 66 deletions(-) diff --git a/audio/cheetah/config/audio_policy_configuration.xml b/audio/cheetah/config/audio_policy_configuration.xml index ea0a211..ac997b5 100644 --- a/audio/cheetah/config/audio_policy_configuration.xml +++ b/audio/cheetah/config/audio_policy_configuration.xml @@ -50,11 +50,11 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + @@ -185,27 +185,27 @@ + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> diff --git a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml index 1abeb57..dbc00c3 100644 --- a/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/cheetah/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -50,11 +50,11 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + @@ -170,21 +170,21 @@ + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> diff --git a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml index e7f84c3..342f855 100644 --- a/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/cheetah/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -50,11 +50,11 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + @@ -170,21 +170,21 @@ + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> diff --git a/audio/cheetah/config/mixer_paths.xml b/audio/cheetah/config/mixer_paths.xml index f45b7d4..43e9034 100644 --- a/audio/cheetah/config/mixer_paths.xml +++ b/audio/cheetah/config/mixer_paths.xml @@ -39,6 +39,7 @@ + diff --git a/audio/panther/config/audio_policy_configuration.xml b/audio/panther/config/audio_policy_configuration.xml index ea0a211..ac997b5 100644 --- a/audio/panther/config/audio_policy_configuration.xml +++ b/audio/panther/config/audio_policy_configuration.xml @@ -50,11 +50,11 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + @@ -185,27 +185,27 @@ + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> diff --git a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml index 1abeb57..dbc00c3 100644 --- a/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/panther/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -50,11 +50,11 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + @@ -170,21 +170,21 @@ + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> diff --git a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml index e7f84c3..342f855 100644 --- a/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/panther/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -50,11 +50,11 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> - + @@ -170,21 +170,21 @@ + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> + sources="primary output,deep buffer,haptic,voip_rx,compressed_offload"/> diff --git a/audio/panther/config/mixer_paths.xml b/audio/panther/config/mixer_paths.xml index f45b7d4..43e9034 100644 --- a/audio/panther/config/mixer_paths.xml +++ b/audio/panther/config/mixer_paths.xml @@ -39,6 +39,7 @@ + diff --git a/init.insmod.cheetah.cfg b/init.insmod.cheetah.cfg index 5d0009b..05dbbf8 100644 --- a/init.insmod.cheetah.cfg +++ b/init.insmod.cheetah.cfg @@ -10,7 +10,9 @@ modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-spi.ko modprobe|ftm5.ko modprobe|sec_touch.ko +modprobe|cl_dsp.ko modprobe|input-cs40l26-i2c.ko +modprobe|snd-soc-cs40l26.ko # All device specific modules loaded setprop|vendor.device.modules.ready diff --git a/init.insmod.panther.cfg b/init.insmod.panther.cfg index c558759..487afbe 100644 --- a/init.insmod.panther.cfg +++ b/init.insmod.panther.cfg @@ -10,7 +10,9 @@ modprobe|bcmdhd4389.ko modprobe|snd-soc-cs35l41-spi.ko modprobe|ftm5.ko modprobe|sec_touch.ko +modprobe|cl_dsp.ko modprobe|input-cs40l26-i2c.ko +modprobe|snd-soc-cs40l26.ko # All device specific modules loaded setprop|vendor.device.modules.ready From 12d950f1d1dc4b590b6ff6f2793e2d25b4225f10 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 16 Feb 2022 11:54:02 +0800 Subject: [PATCH 3/3] thermal: bringup basic thermal throttling for dogfood Bug: 219869479 Test: verified by emul_temp Change-Id: Ifc2123bd78c62126a25b5d3e4d9413a4dc97bcd6 --- thermal_info_config_cheetah.json | 19 ++++++++++++++----- thermal_info_config_panther.json | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 7281a6c..a88aa37 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -296,23 +296,27 @@ "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 0, 0, 7, 8, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 0, 0, 10, 12, 14, 14] }, { "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 0, 0, 15, 15, 17, 17] }, { "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 0, 0, 9, 10, 11, 11] }, { "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + }, + { + "CdevRequest": "gxp-cooling", + "LimitInfo": [0, 0, 0, 0, 0, 9, 9] } ] }, @@ -1020,6 +1024,11 @@ "Name":"tpu_cooling", "Type":"NPU", "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" + }, + { + "Name":"gxp-cooling", + "Type":"NPU", + "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote" } ], "PowerRails":[ diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index d500b15..ef853f2 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -322,23 +322,27 @@ "BindedCdevInfo": [ { "CdevRequest": "thermal-cpufreq-0", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 0, 0, 7, 8, 10, 10] }, { "CdevRequest": "thermal-cpufreq-1", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 0, 0, 10, 12, 14, 14] }, { "CdevRequest": "thermal-cpufreq-2", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 0, 0, 15, 15, 17, 17] }, { "CdevRequest": "thermal-gpufreq-0", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 0, 0, 9, 10, 11, 11] }, { "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 0, 0, 0, 0, 0, 0] + "LimitInfo": [0, 2, 3, 4, 5, 5, 5] + }, + { + "CdevRequest": "gxp-cooling", + "LimitInfo": [0, 0, 0, 0, 0, 9, 9] } ] }, @@ -1048,6 +1052,11 @@ "Name":"tpu_cooling", "Type":"NPU", "WritePath":"/dev/thermal/cdev-by-name/tpu_cooling/user_vote" + }, + { + "Name":"gxp-cooling", + "Type":"NPU", + "WritePath":"/dev/thermal/cdev-by-name/gxp-cooling/user_vote" } ], "PowerRails":[