Enum local

Android.bp

@@ -1,30 +1,76 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-cc_defaults {
-    name: "minigbm_defaults",
+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",
-        "evdi.c",
-        "exynos.c",
-        "helpers_array.c",
-        "helpers.c",
+        "drv_array_helpers.c",
+        "drv_helpers.c",
+        "dumb_driver.c",
         "i915.c",
-        "marvell.c",
         "mediatek.c",
-        "meson.c",
         "msm.c",
-        "nouveau.c",
-        "radeon.c",
         "rockchip.c",
-        "tegra.c",
-        "udl.c",
         "vc4.c",
-        "vgem.c",
-        "virtio_gpu.c",
+        "virtgpu.c",
+        "virtgpu_cross_domain.c",
+        "virtgpu_virgl.c",
+        "xe.c",
+        "intel_device.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_gralloc1_files",
+    srcs: ["cros_gralloc/gralloc1/cros_gralloc1_module.cc"],
+}
+
+cc_defaults {
+    name: "minigbm_defaults",
 
     cflags: [
         "-D_GNU_SOURCE=1",
@@ -35,83 +81,97 @@ cc_defaults {
         "-Wcast-qual",
         "-Wcast-align",
         "-Wno-unused-parameter",
+        "-Wno-switch",
+        "-Wno-format",
+        "-Wno-unused-variable",
+        "-DDRV_I915",
+        "-DDRV_XE",
+        "-DUSE_GRALLOC1",
+        "-Wno-cast-qual",
     ],
-    cppflags: ["-std=c++14"],
 
-    vendor: true,
+    product_variables: {
+        platform_sdk_version: {
+            cflags: ["-DANDROID_API_LEVEL=33"],
+        },
+    },
+}
+
+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",
-        "libnativewindow_headers",
         "libsystem_headers",
+        "minigbm_headers",
     ],
 
-    export_header_lib_headers: [
-        "libhardware_headers",
-        "libnativebase_headers",
-        "libnativewindow_headers",
-        "libsystem_headers",
-    ],
+    static_libs: ["libarect"],
+
+    vendor: true,
 
     shared_libs: [
         "libcutils",
+        "libdmabufheap",
         "libdrm",
         "libnativewindow",
         "libsync",
         "liblog",
     ],
-
-    static_libs: ["libarect"],
-
-    export_static_lib_headers: ["libarect"],
 }
 
 cc_defaults {
-    name: "minigbm_cros_gralloc_defaults",
-
-    defaults: ["minigbm_defaults"],
-
-    srcs: [
-        "cros_gralloc/cros_gralloc_buffer.cc",
-        "cros_gralloc/cros_gralloc_helpers.cc",
-        "cros_gralloc/cros_gralloc_driver.cc",
-    ]
-}
-
-cc_library_static {
-    name: "libminigbm",
-    defaults: ["minigbm_defaults"],
-    shared_libs: ["liblog"],
-    static_libs: ["libdrm"],
+    name: "minigbm_cros_gralloc_library_defaults",
 
+    defaults: ["minigbm_cros_gralloc_defaults"],
     srcs: [
-        "gbm.c",
-        "gbm_helpers.c",
+        ":minigbm_core_files",
+        ":minigbm_gralloc_common_files",
     ],
-
-    export_include_dirs: ["."],
 }
 
-cc_library_static {
-    name: "libminigbm_cros_gralloc",
+cc_defaults {
+    name: "minigbm_cros_gralloc1_defaults",
+
     defaults: ["minigbm_cros_gralloc_defaults"],
-    shared_libs: ["liblog"],
-    static_libs: ["libdrm"],
+    relative_install_path: "hw",
 
-    export_include_dirs: ["."],
-}
+    srcs: [":minigbm_gralloc1_files"],
+    cflags: [
+        "-Wno-switch",
+        "-Wno-cast-qual",
+        "-DUSE_GRALLOC1",
+    ],
 
-cc_library_shared {
-    name: "gralloc.minigbm",
-    defaults: ["minigbm_cros_gralloc_defaults"],
-    srcs: ["cros_gralloc/gralloc0/gralloc0.cc"],
 }
 
+// Intel
 cc_library_shared {
-    name: "gralloc.minigbm_intel",
-    defaults: ["minigbm_cros_gralloc_defaults"],
+    name: "libminigbm_gralloc_intel",
+    defaults: ["minigbm_cros_gralloc_library_defaults"],
+    cflags: [
+        "-DDRV_I915",
+        "-DDRV_XE",
+        "-DUSE_GRALLOC1",
+        "-Wno-cast-qual",
+        "-Wno-unused-function",
+        "-DHAVE_MEMFD_CREATE",
+        "-mclflushopt",
+    ],
     enabled: false,
+    local_include_dirs: [
+        "cros_gralloc",
+    ],
     arch: {
         x86: {
             enabled: true,
@@ -120,13 +180,22 @@ cc_library_shared {
             enabled: true,
         },
     },
-    cflags: ["-DDRV_I915"],
-    srcs: ["cros_gralloc/gralloc0/gralloc0.cc"],
 }
 
 cc_library_shared {
-    name: "gralloc.minigbm_meson",
-    defaults: ["minigbm_cros_gralloc_defaults"],
-    cflags: ["-DDRV_MESON"],
-    srcs: ["cros_gralloc/gralloc0/gralloc0.cc"],
-}
+    name: "gralloc.intel",
+    defaults: ["minigbm_cros_gralloc1_defaults"],
+    shared_libs: ["libminigbm_gralloc_intel"],
+    enabled: false,
+    local_include_dirs: [
+        "cros_gralloc",
+    ],
+    arch: {
+        x86: {
+            enabled: true,
+        },
+        x86_64: {
+            enabled: true,
+        },
+    },
+}

DIR_METADATA

@@ -0,0 +1,34 @@
+# Metadata information for this directory.
+#
+# For more information on DIR_METADATA files, see:
+#   https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/README.md
+#
+# For the schema of this file, see Metadata message:
+#   https://source.chromium.org/chromium/infra/infra/+/HEAD:go/src/infra/tools/dirmd/proto/dir_metadata.proto
+
+buganizer {
+  # ChromeOS > Platform > Graphics > Graphics Virtualization
+  component_id: 964076
+}
+
+chromeos {
+  cq {
+    source_test_plans {
+      test_plan_starlark_files {
+        host: "chrome-internal.googlesource.com"
+        project: "chromeos/config-internal"
+        path: "test/plans/v2/ctpv1_compatible/legacy_default_tast_hw.star"
+      }
+      test_plan_starlark_files {
+        host: "chrome-internal.googlesource.com"
+        project: "chromeos/config-internal"
+        path: "test/plans/v2/ctpv1_compatible/legacy_default_autotest_hw.star"
+      }
+      test_plan_starlark_files {
+        host: "chrome-internal.googlesource.com"
+        project: "chromeos/config-internal"
+        path: "test/plans/v2/ctpv1_compatible/legacy_default_vm.star"
+      }
+    }
+  }
+}

Makefile

@@ -16,15 +16,15 @@ ifdef DRV_AMDGPU
 	CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_amdgpu)
 	LDLIBS += -ldrm_amdgpu -ldl
 endif
-ifdef DRV_EXYNOS
-	CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_exynos)
-endif
 ifdef DRV_I915
 	CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_intel)
 endif
 ifdef DRV_MESON
 	CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_meson)
 endif
+ifdef DRV_MSM
+	CFLAGS += -ldl
+endif
 ifdef DRV_RADEON
 	CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_radeon)
 endif
@@ -34,6 +34,9 @@ endif
 ifdef DRV_VC4
 	CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_vc4)
 endif
+ifdef DRV_XE
+	CFLAGS += $(shell $(PKG_CONFIG) --cflags libdrm_intel)
+endif
 
 CPPFLAGS += $(PC_CFLAGS)
 LDLIBS += $(PC_LIBS)
@@ -46,6 +49,7 @@ MINIGBM_FILENAME := libminigbm.so.$(MINIGBM_VERSION)
 
 CC_LIBRARY($(MINIGBM_FILENAME)): LDFLAGS += -Wl,-soname,libgbm.so.$(GBM_VERSION_MAJOR)
 CC_LIBRARY($(MINIGBM_FILENAME)): $(C_OBJECTS)
+CC_STATIC_LIBRARY(libminigbm.pie.a): $(C_OBJECTS)
 
 all: CC_LIBRARY($(MINIGBM_FILENAME))
 
@@ -58,3 +62,4 @@ install: all
 	ln -sf $(MINIGBM_FILENAME) $(DESTDIR)/$(LIBDIR)/libgbm.so.$(GBM_VERSION_MAJOR)
 	install -D -m 0644 $(SRC)/gbm.pc $(DESTDIR)$(LIBDIR)/pkgconfig/gbm.pc
 	install -D -m 0644 $(SRC)/gbm.h $(DESTDIR)/usr/include/gbm.h
+	install -D -m 0644 $(SRC)/minigbm_helpers.h $(DESTDIR)/usr/include/minigbm/minigbm_helpers.h

OWNERS

@@ -1,11 +1,20 @@
+basni@chromium.org
 dbehr@chromium.org
-dcastagna@chromium.org
 ddavenport@chromium.org
 gurchetansingh@chromium.org
+hiroh@chromium.org
 hoegsberg@chromium.org
-ihf@chromium.org
-lepton@chromium.org
 marcheu@chromium.org
-stevensd@chromium.org
+mcasas@chromium.org
+olv@google.com
+robdclark@chromium.org
 tfiga@chromium.org
-tutankhamen@chromium.org
+zzyiwei@chromium.org
+
+# just reference for backend specific reviews
+per-file amdgpu.c = basni@chromium.org, ddavenport@chromium.org
+per-file i915.c = chadversary@chromium.org, hoegsberg@chromium.org
+per-file mediatek.c = fshao@chromium.org, hsinyi@chromium.org, tzungbi@chromium.org
+per-file msm.c = robdclark@chromium.org, hoegsberg@chromium.org
+per-file rockchip.c = tfiga@chromium.org
+per-file virtgpu* = jbates@chromium.org, natsu@google.com, olv@google.com, zzyiwei@chromium.org