minigbm: add new GBM_BO_IMPORT_FD_PLANAR

This is helpful for importing multiplanar formats (see b/31999328)
and importing AFBC format modifiers.

BUG=chrome-os-partner:56407
TEST=drm-tests null_platform_test with AFBC support
     test_that -b cyan $IP1 graphics_Gbm to check for regressions

Change-Id: If7ed9b54e18069ca69b2dbda2b01d59ce58ebeef
Reviewed-on: https://chromium-review.googlesource.com/401439
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Daniele Castagna <dcastagna@chromium.org>

diff --git a/drv.c b/drv.c
index e2eb7a1..3f9ecae 100644 (file)
--- a/drv.c
+++ b/drv.c
@@ -298,6 +298,7 @@ struct bo *drv_bo_import(struct driver *drv, struct drv_import_fd_data *data)
                bo->strides[plane] = data->strides[plane];
                bo->offsets[plane] = data->offsets[plane];
                bo->sizes[plane] = data->sizes[plane];
+               bo->format_modifiers[plane] = data->format_modifiers[plane];
                bo->total_size += data->sizes[plane];
 
                pthread_mutex_lock(&drv->table_lock);

diff --git a/drv.h b/drv.h
index 044069f..4b70d58 100644 (file)
--- a/drv.h
+++ b/drv.h
@@ -130,6 +130,7 @@ struct drv_import_fd_data {
        uint32_t strides[DRV_MAX_PLANES];
        uint32_t offsets[DRV_MAX_PLANES];
        uint32_t sizes[DRV_MAX_PLANES];
+       uint64_t format_modifiers[DRV_MAX_PLANES];
        uint32_t width;
        uint32_t height;
        drv_format_t format;
@@ -219,4 +220,3 @@ drv_num_buffers_per_bo(struct bo *bo);
 #endif
 
 #endif
-

diff --git a/gbm.c b/gbm.c
index 50110ea..2235b22 100644 (file)
--- a/gbm.c
+++ b/gbm.c
@@ -158,33 +158,49 @@ gbm_bo_import(struct gbm_device *gbm, uint32_t type,
        struct gbm_bo *bo;
        struct drv_import_fd_data drv_data;
        struct gbm_import_fd_data *fd_data = buffer;
+       struct gbm_import_fd_planar_data *fd_planar_data = buffer;
+       uint32_t gbm_format;
+       int i;
 
-       if (type != GBM_BO_IMPORT_FD)
+       memset(&drv_data, 0, sizeof(drv_data));
+
+       switch (type) {
+       case GBM_BO_IMPORT_FD:
+               gbm_format = fd_data->format;
+               drv_data.width = fd_data->width;
+               drv_data.height = fd_data->height;
+               drv_data.format = gbm_convert_format(fd_data->format);
+               drv_data.fds[0] = fd_data->fd;
+               drv_data.strides[0] = fd_data->stride;
+               drv_data.sizes[0] = fd_data->height * fd_data->stride;
+               break;
+       case GBM_BO_IMPORT_FD_PLANAR:
+               gbm_format = fd_planar_data->format;
+               drv_data.width = fd_planar_data->width;
+               drv_data.height = fd_planar_data->height;
+               drv_data.format = gbm_convert_format(fd_planar_data->format);
+               for (i = 0; i < GBM_MAX_PLANES; i++) {
+                       drv_data.fds[i] = fd_planar_data->fds[i];
+                       drv_data.offsets[i] = fd_planar_data->offsets[i];
+                       drv_data.strides[i] = fd_planar_data->strides[i];
+                       drv_data.sizes[i] = fd_planar_data->height *
+                                           fd_planar_data->strides[i];
+                       drv_data.format_modifiers[i] =
+                               fd_planar_data->format_modifiers[i];
+               }
+               break;
+       default:
                return NULL;
+       }
 
-       if (!gbm_device_is_format_supported(gbm, fd_data->format, usage))
+       if (!gbm_device_is_format_supported(gbm, gbm_format, usage))
                return NULL;
 
-       bo = gbm_bo_new(gbm, fd_data->format);
+       bo = gbm_bo_new(gbm, gbm_format);
 
        if (!bo)
                return NULL;
 
-       /*
-        * Minigbm only supports importing single-plane formats at moment.
-        * If multi-plane import is desired, the interface will have to be
-        * modified.
-        */
-
-       memset(&drv_data, 0, sizeof(drv_data));
-       drv_data.fds[0] = fd_data->fd;
-       drv_data.strides[0] = fd_data->stride;
-       drv_data.offsets[0] = 0;
-       drv_data.sizes[0] = fd_data->height * fd_data->stride;
-       drv_data.width = fd_data->width;
-       drv_data.height = fd_data->height;
-       drv_data.format = gbm_convert_format(fd_data->format);
-
        bo->bo = drv_bo_import(gbm->drv, &drv_data);
 
        if (!bo->bo) {

diff --git a/gbm.h b/gbm.h
index cc36b72..839e2a5 100644 (file)
--- a/gbm.h
+++ b/gbm.h
@@ -68,6 +68,8 @@ union gbm_bo_handle {
    uint64_t u64;
 };
 
+#define GBM_MAX_PLANES 4
+
 #define __gbm_fourcc_code(a,b,c,d) ((uint32_t)(a) | ((uint32_t)(b) << 8) | \
                              ((uint32_t)(c) << 16) | ((uint32_t)(d) << 24))
 
@@ -262,6 +264,7 @@ gbm_bo_create(struct gbm_device *gbm,
 #define GBM_BO_IMPORT_WL_BUFFER         0x5501
 #define GBM_BO_IMPORT_EGL_IMAGE         0x5502
 #define GBM_BO_IMPORT_FD                0x5503
+#define GBM_BO_IMPORT_FD_PLANAR         0x5504
 
 struct gbm_import_fd_data {
    int fd;
@@ -271,6 +274,16 @@ struct gbm_import_fd_data {
    uint32_t format;
 };
 
+struct gbm_import_fd_planar_data {
+   int fds[GBM_MAX_PLANES];
+   uint32_t width;
+   uint32_t height;
+   uint32_t format;
+   uint32_t strides[GBM_MAX_PLANES];
+   uint32_t offsets[GBM_MAX_PLANES];
+   uint64_t format_modifiers[GBM_MAX_PLANES];
+};
+
 struct gbm_bo *
 gbm_bo_import(struct gbm_device *gbm, uint32_t type,
               void *buffer, uint32_t usage);