Snap for 12238800 from 9adfff45e2
to mainline-tzdata6-release
Change-Id: Ic125736cc1adf80f3b5c57102d9f05a6cad4b416
This commit is contained in:
commit
1d3254949e
9 changed files with 46 additions and 72 deletions
|
@ -46,6 +46,7 @@ endif
|
|||
BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
|
||||
BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
|
||||
BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
|
||||
BOARD_KERNEL_CMDLINE += rcupdate.rcu_expedited=1 rcu_nocbs=all rcutree.enable_rcu_lazy
|
||||
BOARD_KERNEL_CMDLINE += swiotlb=noforce
|
||||
BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
|
||||
|
||||
|
@ -366,7 +367,12 @@ BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES = fips140.ko
|
|||
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k)))
|
||||
|
||||
# Kernel modules that are listed in vendor_boot.modules.load
|
||||
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
|
||||
# Starting from 6.1, use modules.load instead. It lists modules for vendor ramdisk regardless of the partition name.
|
||||
ifneq ($(wildcard $(KERNEL_MODULE_DIR)/modules.load),)
|
||||
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/modules.load))
|
||||
else
|
||||
BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_boot.modules.load))
|
||||
endif
|
||||
ifndef BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD_FILE
|
||||
$(error vendor_boot.modules.load not found or empty)
|
||||
endif
|
||||
|
|
2
OWNERS
2
OWNERS
|
@ -2,4 +2,4 @@ per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.c
|
|||
per-file powerhint.json = wvw@google.com,joaodias@google.com,jenhaochen@google.com,rkganesh@google.com,jychen@google.com
|
||||
|
||||
# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
|
||||
per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS
|
||||
per-file *.mk,{**/,}Android.bp=file:device/google/gs-common:main:/MK_OWNERS
|
||||
|
|
2
conf/OWNERS
Normal file
2
conf/OWNERS
Normal file
|
@ -0,0 +1,2 @@
|
|||
# per-file for Pixel fstab
|
||||
per-file fstab.*=file:device/google/gs-common:main:/FSTAB_OWNERS
|
|
@ -137,16 +137,6 @@ on init
|
|||
write /sys/class/net/rmnet6/queues/rx-0/rps_cpus fe
|
||||
write /sys/class/net/rmnet7/queues/rx-0/rps_cpus fe
|
||||
|
||||
# Create UDS structure for base VR services.
|
||||
mkdir /dev/socket/pdx 0775 system system
|
||||
mkdir /dev/socket/pdx/system 0775 system system
|
||||
mkdir /dev/socket/pdx/system/buffer_hub 0775 system system
|
||||
mkdir /dev/socket/pdx/system/performance 0775 system system
|
||||
mkdir /dev/socket/pdx/system/vr 0775 system system
|
||||
mkdir /dev/socket/pdx/system/vr/display 0775 system system
|
||||
mkdir /dev/socket/pdx/system/vr/pose 0775 system system
|
||||
mkdir /dev/socket/pdx/system/vr/sensors 0775 system system
|
||||
|
||||
# Boot time 183626384
|
||||
write /proc/vendor_sched/groups/ta/uclamp_min 201
|
||||
write /proc/vendor_sched/groups/ta/prefer_idle 1
|
||||
|
@ -703,6 +693,12 @@ on property:sys.boot_completed=1
|
|||
write /dev/cpuset/camera-daemon/cpus ${persist.device_config.vendor_system_native.camera-daemon_cpuset:-0-7}
|
||||
setprop vendor.powerhal.init 1
|
||||
|
||||
# Setup scheduler parameters
|
||||
write /proc/vendor_sched/min_granularity_ns 1000000
|
||||
write /proc/vendor_sched/latency_ns 8000000
|
||||
write /proc/vendor_sched/max_load_balance_interval 1
|
||||
write /proc/vendor_sched/enable_hrtick 1
|
||||
|
||||
# Setup final cpu.uclamp
|
||||
write /proc/vendor_sched/groups/ta/uclamp_min 1
|
||||
write /proc/vendor_sched/groups/fg/uclamp_min 0
|
||||
|
@ -855,50 +851,10 @@ on property:vendor.thermal.link_ready=1
|
|||
write /sys/devices/virtual/pmic/mitigation/clock_ratio/gpu_heavy_clk_ratio 0xfff04385
|
||||
write /sys/devices/virtual/pmic/mitigation/clock_ratio/tpu_heavy_clk_ratio 0xfff041c1
|
||||
write /sys/devices/virtual/pmic/mitigation/clock_ratio/cpu2_heavy_clk_ratio 0xfff041c0
|
||||
write /dev/thermal/tz-by-name/smpl_gm/policy user_space
|
||||
write /dev/thermal/tz-by-name/vdroop1/policy user_space
|
||||
write /dev/thermal/tz-by-name/vdroop2/policy user_space
|
||||
write /dev/thermal/tz-by-name/ocp_cpu1/policy user_space
|
||||
write /dev/thermal/tz-by-name/ocp_cpu2/policy user_space
|
||||
write /dev/thermal/tz-by-name/ocp_tpu/policy user_space
|
||||
write /dev/thermal/tz-by-name/ocp_gpu/policy user_space
|
||||
write /dev/thermal/tz-by-name/soft_ocp_cpu1/policy user_space
|
||||
write /dev/thermal/tz-by-name/soft_ocp_cpu2/policy user_space
|
||||
write /dev/thermal/tz-by-name/soft_ocp_tpu/policy user_space
|
||||
write /dev/thermal/tz-by-name/soft_ocp_gpu/policy user_space
|
||||
write /dev/thermal/tz-by-name/soc/policy user_space
|
||||
write /dev/thermal/tz-by-name/batoilo/policy user_space
|
||||
write /sys/devices/virtual/pmic/mitigation/triggered_lvl/smpl_lvl 3100
|
||||
write /sys/devices/virtual/pmic/mitigation/clock_div/tpu_clk_div 0x1
|
||||
write /sys/devices/virtual/pmic/mitigation/clock_div/gpu_clk_div 0x1
|
||||
write /sys/devices/virtual/pmic/mitigation/clock_div/cpu2_clk_div 0x1
|
||||
chown system system /dev/thermal/tz-by-name/soc/mode
|
||||
chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/batoilo/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/vdroop2/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/vdroop1/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/smpl_gm/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/ocp_cpu1/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/ocp_cpu2/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/ocp_tpu/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/ocp_gpu/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/soft_ocp_cpu1/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/soft_ocp_cpu2/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/soft_ocp_tpu/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/soft_ocp_gpu/trip_point_0_hyst
|
||||
chown system system /dev/thermal/tz-by-name/soc/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/soc/trip_point_0_hyst
|
||||
# Thermal
|
||||
chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_temp
|
||||
chown system system /dev/thermal/tz-by-name/quiet_therm/trip_point_0_hyst
|
||||
|
|
|
@ -171,4 +171,11 @@
|
|||
<!-- Notifications -->
|
||||
<permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
|
||||
</exception>
|
||||
|
||||
<exception package="com.google.android.apps.pixel.relationships">
|
||||
<!-- Contacts -->
|
||||
<permission name="android.permission.READ_CALL_LOG" fixed="false"/>
|
||||
<permission name="android.permission.READ_CONTACTS" fixed="false"/>
|
||||
<permission name="android.permission.WRITE_CONTACTS" fixed="false"/>
|
||||
</exception>
|
||||
</exceptions>
|
||||
|
|
27
device.mk
27
device.mk
|
@ -76,7 +76,6 @@ PRODUCT_SOONG_NAMESPACES += \
|
|||
vendor/google/whitechapel/tools \
|
||||
vendor/google/camera \
|
||||
vendor/google/interfaces \
|
||||
vendor/google_devices/common/proprietary/confirmatioui_hal \
|
||||
vendor/google_nos/host/android \
|
||||
vendor/google_nos/test/system-test-harness
|
||||
|
||||
|
@ -186,6 +185,7 @@ USE_LASSEN_OEMHOOK := true
|
|||
# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true.
|
||||
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||
PRODUCT_SOONG_NAMESPACES += vendor/google/tools/power-anomaly-sitril
|
||||
$(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true)
|
||||
endif
|
||||
|
||||
# Use for GRIL
|
||||
|
@ -218,9 +218,18 @@ include device/google/gs-common/gpu/gpu.mk
|
|||
PRODUCT_PACKAGES += \
|
||||
libGLES_mali \
|
||||
vulkan.mali \
|
||||
libOpenCL \
|
||||
libgpudataproducer
|
||||
|
||||
# Install the OpenCL ICD Loader
|
||||
PRODUCT_SOONG_NAMESPACES += external/OpenCL-ICD-Loader
|
||||
PRODUCT_PACKAGES += \
|
||||
libOpenCL \
|
||||
mali_icd__customer_pixel_opencl-icd_ARM.icd
|
||||
ifeq ($(DEVICE_IS_64BIT_ONLY),false)
|
||||
PRODUCT_PACKAGES += \
|
||||
mali_icd__customer_pixel_opencl-icd_ARM32.icd
|
||||
endif
|
||||
|
||||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
ro.hardware.vulkan=mali
|
||||
|
||||
|
@ -231,7 +240,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
|
|||
PRODUCT_VENDOR_PROPERTIES += \
|
||||
vendor.mali.platform.config=/vendor/etc/mali/platform.config \
|
||||
vendor.mali.debug.config=/vendor/etc/mali/debug.config \
|
||||
vendor.mali.base_protected_max_core_count=3 \
|
||||
vendor.mali.base_protected_max_core_count=4 \
|
||||
vendor.mali.base_protected_tls_max=67108864 \
|
||||
vendor.mali.platform_agt_frequency_khz=24576
|
||||
|
||||
|
@ -277,6 +286,7 @@ PRODUCT_VENDOR_PROPERTIES += ro.surface_flinger.prime_shader_cache.ultrahdr=1
|
|||
DEVICE_MANIFEST_FILE := \
|
||||
device/google/gs101/manifest$(LOCAL_64ONLY).xml
|
||||
|
||||
BOARD_USE_CODEC2_AIDL := V1
|
||||
ifneq (,$(filter aosp_%,$(TARGET_PRODUCT)))
|
||||
DEVICE_MANIFEST_FILE += \
|
||||
device/google/gs101/manifest_media_aosp.xml
|
||||
|
@ -737,12 +747,19 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/gs101/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \
|
||||
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
debug.stagefright.c2-poolmask=458752 \
|
||||
debug.c2.use_dmabufheaps=1 \
|
||||
media.c2.dmabuf.padding=512 \
|
||||
debug.stagefright.ccodec_delayed_params=1 \
|
||||
ro.vendor.gpu.dataspace=1
|
||||
|
||||
ifneq ($(BOARD_USE_CODEC2_AIDL), )
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
debug.stagefright.c2-poolmask=1507328
|
||||
else
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
debug.stagefright.c2-poolmask=458752
|
||||
endif
|
||||
|
||||
# Create input surface on the framework side
|
||||
PRODUCT_PROPERTY_OVERRIDES += \
|
||||
debug.stagefright.c2inputsurface=-1 \
|
||||
|
@ -804,8 +821,6 @@ PRODUCT_PACKAGES_DEBUG += \
|
|||
trusty-ut-ctrl \
|
||||
tipc-test
|
||||
|
||||
include device/google/gs101/confirmationui/confirmationui.mk
|
||||
|
||||
include device/google/gs101/trusty_metricsd/trusty_metricsd.mk
|
||||
|
||||
PRODUCT_PACKAGES += \
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
</hal>
|
||||
<hal format="aidl" optional="true">
|
||||
<name>com.google.hardware.pixel.display</name>
|
||||
<version>12</version>
|
||||
<version>13</version>
|
||||
<interface>
|
||||
<name>IDisplay</name>
|
||||
<instance>default</instance>
|
||||
|
|
|
@ -369,18 +369,6 @@
|
|||
"Type": "EndHint",
|
||||
"Value": "DISABLE_TA_BOOST"
|
||||
},
|
||||
{
|
||||
"PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
|
||||
"Node": "LimitFlashCurrent",
|
||||
"Duration": 0,
|
||||
"Value": "100"
|
||||
},
|
||||
{
|
||||
"PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
|
||||
"Node": "LimitFlashCurrent",
|
||||
"Duration": 0,
|
||||
"Value": "1500"
|
||||
},
|
||||
{
|
||||
"PowerHint": "EXPENSIVE_RENDERING",
|
||||
"Node": "PowerHALRenderingState",
|
||||
|
|
|
@ -74,7 +74,7 @@ constexpr char kProcInterruptsPath[] = "/proc/interrupts";
|
|||
constexpr char kProcIrqPath[] = "/proc/irq/";
|
||||
constexpr char kSmpAffinityList[] = "/smp_affinity_list";
|
||||
#ifndef UDC_PATH
|
||||
#define UDC_PATH "/sys/class/udc/11110000.dwc3/"
|
||||
#define UDC_PATH "/sys/devices/platform/11110000.usb/11110000.dwc3/udc/11110000.dwc3/"
|
||||
#endif
|
||||
static MonitorFfs monitorFfs(kGadgetName);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue