author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-11-17 20:06:33 (GMT) |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-17 20:06:33 (GMT) |
commit | 2a56ed245abc02937a408a54374b73ea5ff0aca3 (patch) | |
tree | 165e0799eadb9bcec47e3b08d802a5d553b65cd0 | |
parent | d35176c3791f1f550ad0347e8aa5eeff4a1c8b52 (diff) | |
parent | e8a13b34f2d94d789378fddea760c879e7a6506e (diff) | |
download | common-2a56ed245abc02937a408a54374b73ea5ff0aca3.zip common-2a56ed245abc02937a408a54374b73ea5ff0aca3.tar.gz common-2a56ed245abc02937a408a54374b73ea5ff0aca3.tar.bz2 |
Merge changes from topic "r25p0 GPU DDK upgradation" into r-tv-dev am: e8a13b34f2
Original change: undetermined
Change-Id: I14498834a658a721d357e2d1fd9b311be5b346d7
-rw-r--r-- | core_amlogic.mk | 6 | ||||
-rw-r--r-- | gpu/dvalin-kernel.mk | 2 | ||||
-rw-r--r-- | gpu/dvalin-user-arm64.mk | 6 | ||||
-rw-r--r-- | gpu/gondul-kernel.mk | 2 | ||||
-rw-r--r-- | gpu/gondul-user-arm64.mk | 6 | ||||
-rw-r--r-- | hidl_manifests/manifest_common.xml | 4 | ||||
-rw-r--r-- | sepolicy/bootanim.te | 1 | ||||
-rw-r--r-- | sepolicy/file_contexts | 4 | ||||
-rw-r--r-- | sepolicy/hal_graphics_allocator_default_tmpfs.te | 2 | ||||
-rw-r--r-- | sepolicy/hal_graphics_composer_default.te | 3 | ||||
-rw-r--r-- | sepolicy/mediacodec.te | 2 | ||||
-rw-r--r-- | sepolicy/mediaserver.te | 1 | ||||
-rw-r--r-- | sepolicy/mediaswcodec.te | 1 | ||||
-rw-r--r-- | sepolicy/platform_app.te | 1 | ||||
-rw-r--r-- | sepolicy/priv_app.te | 3 | ||||
-rw-r--r-- | sepolicy/surfaceflinger.te | 3 | ||||
-rw-r--r-- | sepolicy/system_app.te | 1 | ||||
-rw-r--r-- | sepolicy/system_server.te | 1 | ||||
-rw-r--r-- | sepolicy/traceur_app.te | 1 | ||||
-rw-r--r-- | sepolicy/untrusted_app.te | 1 | ||||
-rw-r--r-- | sepolicy/untrusted_app_25.te | 1 | ||||
-rw-r--r-- | sepolicy/untrusted_app_27.te | 1 | ||||
-rw-r--r-- | sepolicy/untrusted_app_29.te | 2 |
23 files changed, 40 insertions, 15 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index 9745ac1..7890296 100644 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -364,9 +364,9 @@ PRODUCT_PACKAGES += \ # Gralloc HAL PRODUCT_PACKAGES += \ - android.hardware.graphics.mapper@3.0-impl-arm \ - android.hardware.graphics.allocator@3.0-impl-arm \ - android.hardware.graphics.allocator@3.0-service + android.hardware.graphics.mapper@4.0-impl-arm \ + android.hardware.graphics.allocator@4.0-impl-arm \ + android.hardware.graphics.allocator@4.0-service # HW Composer PRODUCT_PACKAGES += \ diff --git a/gpu/dvalin-kernel.mk b/gpu/dvalin-kernel.mk index 24f44a3..3d8d8d4 100644 --- a/gpu/dvalin-kernel.mk +++ b/gpu/dvalin-kernel.mk @@ -19,7 +19,7 @@ DEFAULT_GPU_KERNEL_MODULES := \ GPU_TYPE:=dvalin GPU_ARCH:=bifrost -GPU_DRV_VERSION?=r21p0 +GPU_DRV_VERSION?=r25p0 GPU_MODS_OUT:=obj/lib_vendor/ CUSTOM_IMAGE_MODULES += mali diff --git a/gpu/dvalin-user-arm64.mk b/gpu/dvalin-user-arm64.mk index a550474..3e44a46 100644 --- a/gpu/dvalin-user-arm64.mk +++ b/gpu/dvalin-user-arm64.mk @@ -17,9 +17,9 @@ GPU_TARGET_PLATFORM := default_8a GPU_TYPE:=dvalin GPU_ARCH:=bifrost -GPU_DRV_VERSION?=r21p0 +GPU_DRV_VERSION?=r25p0 #GRALLOC_USE_GRALLOC1_API:=1 -GRALLOC_API_VERSION:=3.x +GRALLOC_API_VERSION:=4.x GRALLOC_DISABLE_FRAMEBUFFER_HAL:=1 MALI_GPU_SUPPORT_AFBC_BASIC:=1 #MALI_GPU_SUPPORT_AFBC_SPLITBLK:=1 @@ -45,7 +45,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:vendor/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:vendor/etc/permissions/android.hardware.vulkan.compute.xml \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:vendor/etc/permissions/android.hardware.vulkan.level.xml \ - frameworks/native/data/etc/android.software.vulkan.deqp.level-2019-03-01.xml:vendor/etc/permissions/android.software.vulkan.deqp.level-2019-03-01.xml + frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:vendor/etc/permissions/android.software.vulkan.deqp.level-2020-03-01.xml else PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.opengles.aep.xml:vendor/etc/permissions/android.hardware.opengles.aep.xml diff --git a/gpu/gondul-kernel.mk b/gpu/gondul-kernel.mk index bb51451..9d586ad 100644 --- a/gpu/gondul-kernel.mk +++ b/gpu/gondul-kernel.mk @@ -19,7 +19,7 @@ DEFAULT_GPU_KERNEL_MODULES := \ GPU_TYPE:=gondul GPU_ARCH:=bifrost -GPU_DRV_VERSION?=r21p0 +GPU_DRV_VERSION?=r25p0 GPU_MODS_OUT:=obj/lib_vendor/ CUSTOM_IMAGE_MODULES += mali diff --git a/gpu/gondul-user-arm64.mk b/gpu/gondul-user-arm64.mk index 0ba0d69..3b7e4de 100644 --- a/gpu/gondul-user-arm64.mk +++ b/gpu/gondul-user-arm64.mk @@ -17,9 +17,9 @@ GPU_TARGET_PLATFORM := default_8a GPU_TYPE:=gondul GPU_ARCH:=bifrost -GPU_DRV_VERSION?=r21p0 +GPU_DRV_VERSION?=r25p0 #GRALLOC_USE_GRALLOC1_API:=1 -GRALLOC_API_VERSION:=3.x +GRALLOC_API_VERSION:=4.x GRALLOC_DISABLE_FRAMEBUFFER_HAL:=1 MALI_GPU_SUPPORT_AFBC_BASIC:=1 #MALI_GPU_SUPPORT_AFBC_SPLITBLK:=1 @@ -45,7 +45,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.vulkan.version-1_1.xml:vendor/etc/permissions/android.hardware.vulkan.version.xml \ frameworks/native/data/etc/android.hardware.vulkan.compute-0.xml:vendor/etc/permissions/android.hardware.vulkan.compute.xml \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:vendor/etc/permissions/android.hardware.vulkan.level.xml \ - frameworks/native/data/etc/android.software.vulkan.deqp.level-2019-03-01.xml:vendor/etc/permissions/android.software.vulkan.deqp.level-2019-03-01.xml + frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:vendor/etc/permissions/android.software.vulkan.deqp.level-2020-03-01.xml else PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.opengles.aep.xml:vendor/etc/permissions/android.hardware.opengles.aep.xml diff --git a/hidl_manifests/manifest_common.xml b/hidl_manifests/manifest_common.xml index db31041..01da050 100644 --- a/hidl_manifests/manifest_common.xml +++ b/hidl_manifests/manifest_common.xml @@ -56,7 +56,7 @@ <hal format="hidl"> <name>android.hardware.graphics.allocator</name> <transport>hwbinder</transport> - <version>3.0</version> + <version>4.0</version> <interface> <name>IAllocator</name> <instance>default</instance> @@ -65,7 +65,7 @@ <hal format="hidl"> <name>android.hardware.graphics.mapper</name> <transport arch="32+64">passthrough</transport> - <version>3.0</version> + <version>4.0</version> <interface> <name>IMapper</name> <instance>default</instance> diff --git a/sepolicy/bootanim.te b/sepolicy/bootanim.te index f7ae5a9..990c598 100644 --- a/sepolicy/bootanim.te +++ b/sepolicy/bootanim.te @@ -10,6 +10,7 @@ allow bootanim system_data_file:dir { open read }; allow bootanim mediaserver_service:service_manager { find }; allow bootanim mediaserver:binder { call transfer }; allow bootanim debugfs_mali:dir { search }; +allow bootanim hal_graphics_allocator_default_tmpfs:file rw_file_perms; set_prop(bootanim, system_prop) get_prop(bootanim, media_prop) diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts index 13075d9..9d0a570 100644 --- a/sepolicy/file_contexts +++ b/sepolicy/file_contexts @@ -354,6 +354,10 @@ /vendor/lib(64)?/hw/gralloc\.amlogic\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/hw/android\.hardware\.graphics\.mapper@2\.0-impl-2.1\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/hw/android\.hardware\.graphics\.mapper@3\.0-impl-arm\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/hw/android\.hardware\.graphics\.mapper@4\.0-impl-arm\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/libdrm\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/arm\.graphics-V1-ndk_platform\.so u:object_r:same_process_hal_file:s0 +/vendor/lib(64)?/arm\.graphics-V2-ndk_platform\.so u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/extractors u:object_r:same_process_hal_file:s0 /vendor/lib(64)? u:object_r:same_process_hal_file:s0 /vendor/lib(64)?/extractors/libamextractor\.so u:object_r:same_process_hal_file:s0 diff --git a/sepolicy/hal_graphics_allocator_default_tmpfs.te b/sepolicy/hal_graphics_allocator_default_tmpfs.te new file mode 100644 index 0000000..3845869 --- a/dev/null +++ b/sepolicy/hal_graphics_allocator_default_tmpfs.te @@ -0,0 +1,2 @@ +typeattribute hal_graphics_allocator_default_tmpfs mlstrustedobject; +allow { appdomain -isolated_app } hal_graphics_allocator_default_tmpfs:file rw_file_perms; diff --git a/sepolicy/hal_graphics_composer_default.te b/sepolicy/hal_graphics_composer_default.te index 574c99d..f2a5883 100644 --- a/sepolicy/hal_graphics_composer_default.te +++ b/sepolicy/hal_graphics_composer_default.te @@ -32,7 +32,8 @@ allow hal_graphics_composer_default sysfs_video:dir { search }; allow hal_graphics_composer_default sysfs_display:file { read write open getattr }; allow hal_graphics_composer_default sysfs_cec:file rw_file_perms; - +allow hal_graphics_composer_default hal_graphics_allocator_default_tmpfs:fifo_file rw_file_perms; +allow hal_graphics_composer_default hal_graphics_allocator_default_tmpfs:file rw_file_perms; allow hal_graphics_composer_default vendor_platform_prop:file {getattr open read}; get_prop(hal_graphics_composer_default, vendor_platform_prop) allow hal_graphics_composer_default kernel:process setsched; diff --git a/sepolicy/mediacodec.te b/sepolicy/mediacodec.te index 8792091..af7cfb5 100644 --- a/sepolicy/mediacodec.te +++ b/sepolicy/mediacodec.te @@ -25,3 +25,5 @@ allow mediacodec sysfs_audio:file { open read write }; allow mediacodec vendor_platform_prop:file { open read getattr map }; allow mediacodec sysfs_amhdmitx:file rw_file_perms; allow mediacodec sysfs_amhdmitx:dir search; + +allow mediacodec hal_graphics_allocator_default_tmpfs:file rw_file_perms; diff --git a/sepolicy/mediaserver.te b/sepolicy/mediaserver.te index 15198c6..ca59cc2 100644 --- a/sepolicy/mediaserver.te +++ b/sepolicy/mediaserver.te @@ -22,3 +22,4 @@ allow mediaserver system_data_file:file { read getattr }; allow mediaserver subtitleserver_hwservice:hwservice_manager find; allow mediaserver subtitleserver:binder { call transfer }; allow mediaserver subtitleserver:fd use; +allow mediaserver hal_graphics_allocator_default_tmpfs:file rw_file_perms; diff --git a/sepolicy/mediaswcodec.te b/sepolicy/mediaswcodec.te new file mode 100644 index 0000000..b2fc200 --- a/dev/null +++ b/sepolicy/mediaswcodec.te @@ -0,0 +1 @@ +allow mediaswcodec hal_graphics_allocator_default_tmpfs:file rw_file_perms; diff --git a/sepolicy/platform_app.te b/sepolicy/platform_app.te index 61f1f99..0edbcd4 100644 --- a/sepolicy/platform_app.te +++ b/sepolicy/platform_app.te @@ -24,6 +24,7 @@ allow platform_app subtitleserver:binder { call transfer }; allow platform_app imageserver_hwservice:hwservice_manager { find }; allow platform_app imageserver:binder { call transfer }; allow platform_app debugfs_mali:dir search; +allow platform_app hal_graphics_allocator_default_tmpfs:file rw_file_perms; allow platform_app sysfs_amhdmitx:dir { search }; allow platform_app sysfs_amhdmitx:file { read }; allow platform_app vendor_platform_prop:file { read }; diff --git a/sepolicy/priv_app.te b/sepolicy/priv_app.te index d29b1e6..aa42860 100644 --- a/sepolicy/priv_app.te +++ b/sepolicy/priv_app.te @@ -8,7 +8,8 @@ allow priv_app dvb_device:chr_file rw_file_perms; #allow priv_app property_socket:sock_file { write }; #allow priv_app vendor_file:file { open read getattr execute }; - +allow priv_app same_process_hal_file:file { read open getattr execute}; +allow priv_app hal_graphics_allocator_default_tmpfs:file rw_file_perms; allow priv_app zygote:dir { search read }; #allow priv_app zygote:file { open read }; allow priv_app device:dir { read search open }; diff --git a/sepolicy/surfaceflinger.te b/sepolicy/surfaceflinger.te index 3d96110..51f0258 100644 --- a/sepolicy/surfaceflinger.te +++ b/sepolicy/surfaceflinger.te @@ -1,6 +1,9 @@ #allow surfaceflinger vendor_file:file { open read getattr execute }; allow surfaceflinger system_control_service:service_manager find; allow surfaceflinger video_device:chr_file rw_file_perms; +allow surfaceflinger hal_graphics_allocator_default_tmpfs:file rw_file_perms; +allow surfaceflinger hal_graphics_composer_default:file rw_file_perms; +allow surfaceflinger hal_graphics_composer_default:dir search; allow surfaceflinger debugfs_mali:dir search; get_prop(surfaceflinger, tv_prop) set_prop(surfaceflinger, ctl_default_prop) diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te index 42f501f..5b7a638 100644 --- a/sepolicy/system_app.te +++ b/sepolicy/system_app.te @@ -70,6 +70,7 @@ allow system_app sysfs_xbmc:file rw_file_perms; allow system_app subtitle_device:chr_file rw_file_perms; allow system_app debugfs_mali:dir search; +allow system_app hal_graphics_allocator_default_tmpfs:file rw_file_perms; allow system_app vendor_video_device:chr_file {open ioctl read write}; allow system_app sysfs_video:chr_file {open ioctl read write}; diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te index 5ef3807..cdfc151 100644 --- a/sepolicy/system_server.te +++ b/sepolicy/system_server.te @@ -48,3 +48,4 @@ allow system_server dvb_device:chr_file rw_file_perms; allow system_server { sysfs_amhdmitx }:file { read write open getattr }; allow system_server storage_stub_file:dir { getattr }; +allow system_server hal_graphics_allocator_default_tmpfs:file rw_file_perms; diff --git a/sepolicy/traceur_app.te b/sepolicy/traceur_app.te index c0b65e9..63eb04a 100644 --- a/sepolicy/traceur_app.te +++ b/sepolicy/traceur_app.te @@ -1,2 +1,3 @@ allow traceur_app debugfs_mali:dir { search }; +allow traceur_app hal_graphics_allocator_default_tmpfs:file rw_file_perms; diff --git a/sepolicy/untrusted_app.te b/sepolicy/untrusted_app.te index 4ca3340..1c5efed 100644 --- a/sepolicy/untrusted_app.te +++ b/sepolicy/untrusted_app.te @@ -5,5 +5,6 @@ allow untrusted_app fuseblk:file { read open getattr }; #allow untrusted_app vendor_file:file { read open getattr }; allow untrusted_app debugfs_mali:dir search; +allow untrusted_app hal_graphics_allocator_default_tmpfs:file rw_file_perms; get_prop(untrusted_app, netflix_prop) diff --git a/sepolicy/untrusted_app_25.te b/sepolicy/untrusted_app_25.te index b2347d5..c0022f8 100644 --- a/sepolicy/untrusted_app_25.te +++ b/sepolicy/untrusted_app_25.te @@ -5,4 +5,5 @@ allow untrusted_app_25 debugfs_mali:dir search; allow untrusted_app_25 fuseblk:dir { search }; allow untrusted_app_25 fuseblk:file { read open getattr }; +allow untrusted_app_25 hal_graphics_allocator_default_tmpfs:file rw_file_perms; # allow untrusted_app_25 net_dns_prop:file { read }; diff --git a/sepolicy/untrusted_app_27.te b/sepolicy/untrusted_app_27.te index f86fba6..1dcc652 100644 --- a/sepolicy/untrusted_app_27.te +++ b/sepolicy/untrusted_app_27.te @@ -1,5 +1,6 @@ # for collect GL mem track. not easy to remove the search from sourcecode allow untrusted_app_27 debugfs_mali:dir search; allow untrusted_app_27 storage_stub_file:dir { getattr }; +allow untrusted_app_27 hal_graphics_allocator_default_tmpfs:file rw_file_perms; get_prop(untrusted_app_27, netflix_prop) get_prop(untrusted_app_27, media_prop) diff --git a/sepolicy/untrusted_app_29.te b/sepolicy/untrusted_app_29.te index ae15393..19a11ee 100644 --- a/sepolicy/untrusted_app_29.te +++ b/sepolicy/untrusted_app_29.te @@ -5,5 +5,7 @@ allow untrusted_app_29 fuseblk:file { read open getattr }; #allow untrusted_app_29 vendor_file:file { read open getattr }; allow untrusted_app_29 debugfs_mali:dir search; +allow untrusted_app_29 hal_graphics_allocator_default_tmpfs:file rw_file_perms; +allow untrusted_app_29 linkerconfig_file:dir getattr; get_prop(untrusted_app_29, netflix_prop) |