Merge remote-tracking branch 'aosp/upstream-main' into 'aosp/master'
... to pull in support for `gralloc->set(<metadata>)` for Cuttlefish
from https://crrev.com/c/3421048 and the related changes in the chain.
Bug: b/219757060
Test: cvd start
Test: cts dEQP-VK.api.external.memory.android_hardware_buffer.*
Test: vts -m VtsHalGraphicsMapperV4_0Target
Test: cvd start --gpu_mode=gfxstream
Test: cts dEQP-VK.api.external.memory.android_hardware_buffer.*
Test: vts -m VtsHalGraphicsMapperV4_0Target
Change-Id: I541d479da3b208c25666fcc50f89c790c361f1f6
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..3038f22
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,260 @@
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package {
+ default_applicable_licenses: ["external_minigbm_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+ name: "external_minigbm_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "LICENSE",
+ ],
+}
+
+filegroup {
+ name: "minigbm_core_files",
+
+ srcs: [
+ "amdgpu.c",
+ "drv.c",
+ "drv_array_helpers.c",
+ "drv_helpers.c",
+ "dumb_driver.c",
+ "i915.c",
+ "mediatek.c",
+ "msm.c",
+ "rockchip.c",
+ "vc4.c",
+ "virtgpu.c",
+ "virtgpu_cross_domain.c",
+ "virtgpu_virgl.c",
+ ],
+}
+
+filegroup {
+ name: "minigbm_gralloc_common_files",
+
+ srcs: [
+ "cros_gralloc/cros_gralloc_buffer.cc",
+ "cros_gralloc/cros_gralloc_helpers.cc",
+ "cros_gralloc/cros_gralloc_driver.cc",
+ ],
+}
+
+filegroup {
+ name: "minigbm_gralloc0_files",
+ srcs: ["cros_gralloc/gralloc0/gralloc0.cc"],
+}
+
+cc_defaults {
+ name: "minigbm_defaults",
+
+ cflags: [
+ "-D_GNU_SOURCE=1",
+ "-D_FILE_OFFSET_BITS=64",
+ "-Wall",
+ "-Wsign-compare",
+ "-Wpointer-arith",
+ "-Wcast-qual",
+ "-Wcast-align",
+ "-Wno-unused-parameter",
+ ],
+
+ product_variables: {
+ platform_sdk_version: {
+ cflags: ["-DANDROID_API_LEVEL=%d"],
+ },
+ },
+}
+
+cc_library_headers {
+ name: "minigbm_headers",
+ host_supported: true,
+ vendor_available: true,
+ export_include_dirs: ["."],
+}
+
+cc_defaults {
+ name: "minigbm_cros_gralloc_defaults",
+
+ defaults: ["minigbm_defaults"],
+
+ header_libs: [
+ "libhardware_headers",
+ "libnativebase_headers",
+ "libsystem_headers",
+ "minigbm_headers",
+ ],
+
+ static_libs: ["libarect"],
+
+ vendor: true,
+
+ shared_libs: [
+ "libcutils",
+ "libdmabufheap",
+ "libdrm",
+ "libnativewindow",
+ "libsync",
+ "liblog",
+ ],
+}
+
+cc_defaults {
+ name: "minigbm_cros_gralloc_library_defaults",
+
+ defaults: ["minigbm_cros_gralloc_defaults"],
+ srcs: [
+ ":minigbm_core_files",
+ ":minigbm_gralloc_common_files",
+ ],
+}
+
+cc_defaults {
+ name: "minigbm_cros_gralloc0_defaults",
+
+ defaults: ["minigbm_cros_gralloc_defaults"],
+ relative_install_path: "hw",
+
+ srcs: [":minigbm_gralloc0_files"],
+}
+
+cc_library {
+ name: "libgbm",
+ defaults: ["minigbm_defaults"],
+ host_supported: true,
+
+ srcs: [
+ ":minigbm_core_files",
+ "gbm.c",
+ "gbm_helpers.c",
+ ],
+
+ target: {
+ host: {
+ // Avoid linking to another host copy of libdrm; this library will cause
+ // binary GPU drivers to be loaded from the host, which might be linked
+ // to a system copy of libdrm, which conflicts with the AOSP one
+ allow_undefined_symbols: true,
+ header_libs: ["libdrm_headers"],
+ },
+ android: {
+ shared_libs: [
+ "libdrm",
+ "liblog"
+ ],
+ },
+ },
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.virt",
+ ],
+
+ export_include_dirs: ["."],
+}
+
+// Generic
+cc_library_shared {
+ name: "libminigbm_gralloc",
+ defaults: ["minigbm_cros_gralloc_library_defaults"],
+}
+
+cc_library_shared {
+ name: "gralloc.minigbm",
+ defaults: ["minigbm_cros_gralloc0_defaults"],
+ shared_libs: ["libminigbm_gralloc"],
+}
+
+// Intel
+cc_library_shared {
+ name: "libminigbm_gralloc_intel",
+ defaults: ["minigbm_cros_gralloc_library_defaults"],
+ cflags: ["-DDRV_I915"],
+ enabled: false,
+ arch: {
+ x86: {
+ enabled: true,
+ },
+ x86_64: {
+ enabled: true,
+ },
+ },
+}
+
+cc_library_shared {
+ name: "gralloc.minigbm_intel",
+ defaults: ["minigbm_cros_gralloc0_defaults"],
+ shared_libs: ["libminigbm_gralloc_intel"],
+ enabled: false,
+ arch: {
+ x86: {
+ enabled: true,
+ },
+ x86_64: {
+ enabled: true,
+ },
+ },
+}
+
+// Meson
+cc_library_shared {
+ name: "libminigbm_gralloc_meson",
+ defaults: ["minigbm_cros_gralloc_library_defaults"],
+ cflags: ["-DDRV_MESON"],
+}
+
+cc_library_shared {
+ name: "gralloc.minigbm_meson",
+ defaults: ["minigbm_cros_gralloc0_defaults"],
+ shared_libs: ["libminigbm_gralloc_meson"],
+}
+
+// MSM
+cc_library_shared {
+ name: "libminigbm_gralloc_msm",
+ defaults: ["minigbm_cros_gralloc_library_defaults"],
+ cflags: [
+ "-DDRV_MSM",
+ "-DQCOM_DISABLE_COMPRESSED_NV12",
+ ],
+}
+
+cc_library_shared {
+ name: "gralloc.minigbm_msm",
+ defaults: ["minigbm_cros_gralloc0_defaults"],
+ shared_libs: ["libminigbm_gralloc_msm"],
+}
+
+// ARCVM
+cc_library_shared {
+ name: "libminigbm_gralloc_arcvm",
+ defaults: ["minigbm_cros_gralloc_library_defaults"],
+ cflags: ["-DVIRTIO_GPU_NEXT"],
+}
+
+cc_library_shared {
+ name: "gralloc.minigbm_arcvm",
+ defaults: ["minigbm_cros_gralloc0_defaults"],
+ shared_libs: ["libminigbm_gralloc_arcvm"],
+}
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..b281ea4
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,17 @@
+name: "minigbm"
+description:
+ ""
+
+third_party {
+ url {
+ type: HOMEPAGE
+ value: "https://www.chromium.org/"
+ }
+ url {
+ type: GIT
+ value: "https://chromium.googlesource.com/chromiumos/platform/minigbm/"
+ }
+ version: ""
+ last_upgrade_date { year: 2018 month: 6 day: 25 }
+ license_type: NOTICE
+}
diff --git a/MODULE_LICENSE_BSD b/MODULE_LICENSE_BSD
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_BSD
diff --git a/OWNERS.android b/OWNERS.android
new file mode 100644
index 0000000..be55e00
--- /dev/null
+++ b/OWNERS.android
@@ -0,0 +1,2 @@
+adelva@google.com
+natsu@google.com
diff --git a/cros_gralloc/gralloc0/gralloc0.cc b/cros_gralloc/gralloc0/gralloc0.cc
index 13a92f8..ce62521 100644
--- a/cros_gralloc/gralloc0/gralloc0.cc
+++ b/cros_gralloc/gralloc0/gralloc0.cc
@@ -485,6 +485,8 @@
.lockAsync = gralloc0_lock_async,
.unlockAsync = gralloc0_unlock_async,
.lockAsync_ycbcr = gralloc0_lock_async_ycbcr,
+ .validateBufferSize = NULL,
+ .getTransportSize = NULL,
},
.alloc = nullptr,
diff --git a/cros_gralloc/gralloc4/Android.bp b/cros_gralloc/gralloc4/Android.bp
new file mode 100644
index 0000000..b779704
--- /dev/null
+++ b/cros_gralloc/gralloc4/Android.bp
@@ -0,0 +1,147 @@
+//
+// Copyright (C) 2020 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.
+
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "external_minigbm_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ // SPDX-license-identifier-BSD
+ default_applicable_licenses: ["external_minigbm_license"],
+}
+
+filegroup {
+ name: "minigbm_gralloc4_allocator_files",
+ srcs: [
+ "CrosGralloc4Allocator.cc",
+ "CrosGralloc4AllocatorService.cc",
+ "CrosGralloc4Utils.cc",
+ ],
+}
+
+filegroup {
+ name: "minigbm_gralloc4_mapper_files",
+ srcs: [
+ "CrosGralloc4Mapper.cc",
+ "CrosGralloc4Utils.cc",
+ ],
+}
+
+cc_defaults {
+ name: "minigbm_gralloc4_common_defaults",
+ defaults: ["minigbm_cros_gralloc_defaults"],
+
+ shared_libs: [
+ "android.hardware.graphics.mapper@4.0",
+ "libgralloctypes",
+ "libhidlbase",
+ "libbase",
+ "libutils",
+ ],
+
+ cflags: ["-Wno-sign-compare"],
+ relative_install_path: "hw",
+}
+
+cc_defaults {
+ name: "minigbm_gralloc4_allocator_defaults",
+ defaults: ["minigbm_gralloc4_common_defaults"],
+
+ shared_libs: ["android.hardware.graphics.allocator@4.0"],
+ srcs: [":minigbm_gralloc4_allocator_files"],
+}
+
+cc_binary {
+ name: "android.hardware.graphics.allocator@4.0-service.minigbm",
+ defaults: ["minigbm_gralloc4_allocator_defaults"],
+ shared_libs: ["libminigbm_gralloc"],
+ vintf_fragments: ["android.hardware.graphics.allocator@4.0.xml"],
+ init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm.rc"],
+}
+
+cc_binary {
+ name: "android.hardware.graphics.allocator@4.0-service.minigbm_msm",
+ defaults: ["minigbm_gralloc4_allocator_defaults"],
+ shared_libs: ["libminigbm_gralloc_msm"],
+ vintf_fragments: ["android.hardware.graphics.allocator@4.0.xml"],
+ init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm_msm.rc"],
+}
+
+cc_binary {
+ name: "android.hardware.graphics.allocator@4.0-service.minigbm_arcvm",
+ defaults: ["minigbm_gralloc4_allocator_defaults"],
+ shared_libs: ["libminigbm_gralloc_arcvm"],
+ vintf_fragments: ["android.hardware.graphics.allocator@4.0.xml"],
+ init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm_arcvm.rc"],
+}
+
+cc_binary {
+ name: "android.hardware.graphics.allocator@4.0-service.minigbm_intel",
+ defaults: ["minigbm_gralloc4_allocator_defaults"],
+ shared_libs: ["libminigbm_gralloc_intel"],
+ vintf_fragments: ["android.hardware.graphics.allocator@4.0.xml"],
+ init_rc: ["android.hardware.graphics.allocator@4.0-service.minigbm_intel.rc"],
+ enabled: false,
+ arch: {
+ x86: {
+ enabled: true,
+ },
+ x86_64: {
+ enabled: true,
+ },
+ },
+}
+
+cc_library_shared {
+ name: "android.hardware.graphics.mapper@4.0-impl.minigbm",
+ defaults: ["minigbm_gralloc4_common_defaults"],
+ shared_libs: ["libminigbm_gralloc"],
+ vintf_fragments: ["android.hardware.graphics.mapper@4.0.xml"],
+ srcs: [":minigbm_gralloc4_mapper_files"],
+}
+
+cc_library_shared {
+ name: "android.hardware.graphics.mapper@4.0-impl.minigbm_msm",
+ defaults: ["minigbm_gralloc4_common_defaults"],
+ shared_libs: ["libminigbm_gralloc_msm"],
+ vintf_fragments: ["android.hardware.graphics.mapper@4.0.xml"],
+ srcs: [":minigbm_gralloc4_mapper_files"],
+}
+
+cc_library_shared {
+ name: "android.hardware.graphics.mapper@4.0-impl.minigbm_arcvm",
+ defaults: ["minigbm_gralloc4_common_defaults"],
+ shared_libs: ["libminigbm_gralloc_arcvm"],
+ vintf_fragments: ["android.hardware.graphics.mapper@4.0.xml"],
+ srcs: [":minigbm_gralloc4_mapper_files"],
+}
+
+cc_library_shared {
+ name: "android.hardware.graphics.mapper@4.0-impl.minigbm_intel",
+ defaults: ["minigbm_gralloc4_common_defaults"],
+ shared_libs: ["libminigbm_gralloc_intel"],
+ vintf_fragments: ["android.hardware.graphics.mapper@4.0.xml"],
+ srcs: [":minigbm_gralloc4_mapper_files"],
+ enabled: false,
+ arch: {
+ x86: {
+ enabled: true,
+ },
+ x86_64: {
+ enabled: true,
+ },
+ },
+}
diff --git a/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm.rc b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm.rc
index a96a6e1..4f8680b 100644
--- a/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm.rc
+++ b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm.rc
@@ -21,4 +21,4 @@
group graphics drmrpc
capabilities SYS_NICE
onrestart restart surfaceflinger
- writepid /dev/cpuset/system-background/tasks
+ task_profiles ServiceCapacityLow
diff --git a/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_arcvm.rc b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_arcvm.rc
new file mode 100644
index 0000000..4e8818a
--- /dev/null
+++ b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_arcvm.rc
@@ -0,0 +1,24 @@
+#
+# Copyright 2021 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.
+#
+
+service vendor.graphics.allocator-4-0 /vendor/bin/hw/android.hardware.graphics.allocator@4.0-service.minigbm_arcvm
+ interface android.hardware.graphics.allocator@4.0::IAllocator default
+ class hal animation
+ user system
+ group graphics drmrpc
+ capabilities SYS_NICE
+ onrestart restart surfaceflinger
+ task_profiles ServiceCapacityLow
diff --git a/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_intel.rc b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_intel.rc
new file mode 100644
index 0000000..9a3512f
--- /dev/null
+++ b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_intel.rc
@@ -0,0 +1,24 @@
+#
+# Copyright 2020 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.
+#
+
+service vendor.graphics.allocator-4-0 /vendor/bin/hw/android.hardware.graphics.allocator@4.0-service.minigbm_intel
+ interface android.hardware.graphics.allocator@4.0::IAllocator default
+ class hal animation
+ user system
+ group graphics drmrpc
+ capabilities SYS_NICE
+ onrestart restart surfaceflinger
+ task_profiles ServiceCapacityLow
diff --git a/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_msm.rc b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_msm.rc
new file mode 100644
index 0000000..8ecc94b
--- /dev/null
+++ b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0-service.minigbm_msm.rc
@@ -0,0 +1,24 @@
+#
+# Copyright 2020 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.
+#
+
+service vendor.graphics.allocator-4-0 /vendor/bin/hw/android.hardware.graphics.allocator@4.0-service.minigbm_msm
+ interface android.hardware.graphics.allocator@4.0::IAllocator default
+ class hal animation
+ user system
+ group graphics drmrpc
+ capabilities SYS_NICE
+ onrestart restart surfaceflinger
+ task_profiles ServiceCapacityLow
diff --git a/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0.xml b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0.xml
new file mode 100644
index 0000000..04695ef
--- /dev/null
+++ b/cros_gralloc/gralloc4/android.hardware.graphics.allocator@4.0.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+ <hal format="hidl">
+ <name>android.hardware.graphics.allocator</name>
+ <transport>hwbinder</transport>
+ <version>4.0</version>
+ <interface>
+ <name>IAllocator</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+</manifest>
diff --git a/cros_gralloc/gralloc4/android.hardware.graphics.mapper@4.0.xml b/cros_gralloc/gralloc4/android.hardware.graphics.mapper@4.0.xml
new file mode 100644
index 0000000..3160c77
--- /dev/null
+++ b/cros_gralloc/gralloc4/android.hardware.graphics.mapper@4.0.xml
@@ -0,0 +1,11 @@
+<manifest version="1.0" type="device">
+ <hal format="hidl">
+ <name>android.hardware.graphics.mapper</name>
+ <transport arch="32+64">passthrough</transport>
+ <version>4.0</version>
+ <interface>
+ <name>IMapper</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+</manifest>
