hwcomposer: Support CrOS gralloc handle

Used by gralloc.minigbm_gbm_mesa

Author: aleasto

hwcomposer/Android.bp

@@ -44,6 +44,7 @@ cc_library_shared {
     ],
     header_libs: [
         "libsystem_headers",
+        "minigbm_headers",
     ],
     include_dirs: [
         "system/core",

hwcomposer/hwcomposer.cpp

@@ -37,6 +37,7 @@
 #include <presentation-time-client-protocol.h>
 #include <viewporter-client-protocol.h>
 #include <gralloc_handle.h>
+#include <cros_gralloc/cros_gralloc_handle.h>
 
 #define ATRACE_TAG ATRACE_TAG_GRAPHICS
 #include <cutils/trace.h>
@@ -179,11 +180,19 @@ static struct buffer *get_wl_buffer(struct waydroid_hwc_composer_device_1 *pdev,
     if (pdev->display->gtype == GRALLOC_GBM) {
         struct gralloc_handle_t *drm_handle = (struct gralloc_handle_t *)layer->handle;
         if (pdev->display->dmabuf) {
-            ret = create_dmabuf_wl_buffer(pdev->display, buf, drm_handle->width, drm_handle->height, drm_handle->format, drm_handle->prime_fd, drm_handle->stride, drm_handle->modifier);
+            ret = create_dmabuf_wl_buffer(pdev->display, buf, drm_handle->width, drm_handle->height, drm_handle->format, drm_handle->prime_fd, drm_handle->stride, 0 /* offset */, drm_handle->modifier, false /* format_is_drm */);
         } else {
             ret = create_shm_wl_buffer(pdev->display, buf, drm_handle->width, drm_handle->height, drm_handle->format, drm_handle->stride, layer->handle);
             update_shm_buffer(pdev->display, buf);
         }
+    } else if (pdev->display->gtype == GRALLOC_CROS) {
+        const struct cros_gralloc_handle *cros_handle = (const struct cros_gralloc_handle *)layer->handle;
+        if (pdev->display->dmabuf) {
+            ret = create_dmabuf_wl_buffer(pdev->display, buf, cros_handle->width, cros_handle->height, cros_handle->format, cros_handle->fds[0], cros_handle->strides[0], cros_handle->offsets[0], cros_handle->format_modifier, true /* format_is_drm */);
+        } else {
+            ret = create_shm_wl_buffer(pdev->display, buf, cros_handle->width, cros_handle->height, cros_handle->droid_format, cros_handle->strides[0], layer->handle);
+            update_shm_buffer(pdev->display, buf);
+        }
     } else {
         // TODO: use the actual buffer size
         uint32_t format;
@@ -249,7 +258,7 @@ static struct wl_surface *get_surface(struct waydroid_hwc_composer_device_1 *pde
 
     if (pdev->display->viewporter) {
         // can't correctly crop on other gralloc implementations yet
-        if (pdev->display->gtype == GRALLOC_GBM) {
+        if (pdev->display->gtype == GRALLOC_GBM || pdev->display->gtype == GRALLOC_CROS) {
             wp_viewport_set_source(window->viewports[window->lastLayer],
                                    wl_fixed_from_double(fmax(0, sourceCrop.left / (double)pdev->display->scale)),
                                    wl_fixed_from_double(fmax(0, sourceCrop.top / (double)pdev->display->scale)),

hwcomposer/wayland-hwc.cpp

@@ -202,19 +202,19 @@ int ConvertHalFormatToDrm(struct display *display, uint32_t hal_format) {
 int
 create_dmabuf_wl_buffer(struct display *display, struct buffer *buffer,
              int width, int height, int format,
-             int prime_fd, int stride, uint64_t modifier)
+             int prime_fd, int stride, int offset, uint64_t modifier, bool format_is_drm)
 {
     struct zwp_linux_buffer_params_v1 *params;
 
     assert(prime_fd >= 0);
-    buffer->format = ConvertHalFormatToDrm(display, format);
+    buffer->format = format_is_drm ? format : ConvertHalFormatToDrm(display, format);
     assert(buffer->format >= 0);
     buffer->width = width;
     buffer->height = height;
     buffer->stride = stride;
 
     params = zwp_linux_dmabuf_v1_create_params(display->dmabuf);
-    zwp_linux_buffer_params_v1_add(params, prime_fd, 0, 0, buffer->stride, modifier >> 32, modifier & 0xffffffff);
+    zwp_linux_buffer_params_v1_add(params, prime_fd, 0, offset, buffer->stride, modifier >> 32, modifier & 0xffffffff);
     zwp_linux_buffer_params_v1_add_listener(params, &params_listener, buffer);
 
     buffer->buffer = zwp_linux_buffer_params_v1_create_immed(params, buffer->width, buffer->height, buffer->format, 0);
@@ -1594,7 +1594,7 @@ registry_handle_global(void *data, struct wl_registry *registry,
                (strcmp(interface, "android_wlegl") == 0)) {
         d->android_wlegl = (struct android_wlegl*)wl_registry_bind(registry, id,
                 &android_wlegl_interface, 1);
-    } else if ((d->gtype == GRALLOC_GBM) &&
+    } else if ((d->gtype == GRALLOC_GBM || d->gtype == GRALLOC_CROS) &&
                (strcmp(interface, "zwp_linux_dmabuf_v1") == 0)) {
         if (version < 3)
             return;
@@ -1626,6 +1626,8 @@ get_gralloc_type(const char *gralloc)
         return GRALLOC_DEFAULT;
     } else if (strcmp(gralloc, "gbm") == 0) {
         return GRALLOC_GBM;
+    } else if (strcmp(gralloc, "minigbm_gbm_mesa") == 0) {
+        return GRALLOC_CROS;
     } else {
         return GRALLOC_ANDROID;
     }

hwcomposer/wayland-hwc.h

@@ -69,6 +69,7 @@ static const char *INPUT_PIPE_NAME[INPUT_TOTAL] = {
 enum {
     GRALLOC_ANDROID,
     GRALLOC_GBM,
+    GRALLOC_CROS,
     GRALLOC_DEFAULT
 };
 
@@ -188,7 +189,7 @@ create_android_wl_buffer(struct display *display, struct buffer *buffer,
 int
 create_dmabuf_wl_buffer(struct display *display, struct buffer *buffer,
              int width, int height, int format,
-             int prime_fd, int stride, uint64_t modifier);
+             int prime_fd, int stride, int offset, uint64_t modifier, bool format_is_drm);
 
 int
 create_shm_wl_buffer(struct display *display, struct buffer *buffer,