Add new GBM_BO_IMPORT_FD_PLANAR

BUG=chrome-os-partner:56407
TEST=drm-tests null_platform_test with AFBC support

Change-Id: If7ed9b54e18069ca69b2dbda2b01d59ce58ede0b
Reviewed-on: https://chromium-review.googlesource.com/387145
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Kristian H. Kristensen <hoegsberg@chromium.org>
Trybot-Ready: Kristian H. Kristensen <hoegsberg@chromium.org>

diff --git a/drv.c b/drv.c
index f2376a2..d4a50ce 100644 (file)
--- a/drv.c
+++ b/drv.c
@@ -315,6 +315,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];
 
                pthread_mutex_lock(&drv->table_lock);
                drv_increment_reference_count(drv, bo, plane);

diff --git a/drv.h b/drv.h
index cc7752a..dbede51 100644 (file)
--- a/drv.h
+++ b/drv.h
@@ -135,6 +135,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;
@@ -214,4 +215,3 @@ drv_resolve_format(struct driver *drv, drv_format_t format);
 #endif
 
 #endif
-

diff --git a/gbm.c b/gbm.c
index 394aea0..8769b8e 100644 (file)
--- a/gbm.c
+++ b/gbm.c
@@ -158,9 +158,34 @@ 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;
+       int i;
 
-       if (type != GBM_BO_IMPORT_FD)
+       memset(&drv_data, 0, sizeof(drv_data));
+
+       switch (type) {
+       case GBM_BO_IMPORT_FD:
+               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;
+               break;
+       case GBM_BO_IMPORT_FD_PLANAR:
+               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 < 4; 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.format_modifiers[i] =
+                               fd_planar_data->format_modifiers[i];
+               }
+               break;
+       default:
                return NULL;
+       }
 
        if (!gbm_device_is_format_supported(gbm, fd_data->format, usage))
                return NULL;
@@ -170,21 +195,6 @@ gbm_bo_import(struct gbm_device *gbm, uint32_t type,
        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..87c1eb7 100644 (file)
--- a/gbm.h
+++ b/gbm.h
@@ -262,6 +262,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 +272,16 @@ struct gbm_import_fd_data {
    uint32_t format;
 };
 
+struct gbm_import_fd_planar_data {
+   int fds[4];
+   uint32_t width;
+   uint32_t height;
+   uint32_t format;
+   uint32_t offsets[4];
+   uint32_t strides[4];
+   uint64_t format_modifiers[4];
+};
+
 struct gbm_bo *
 gbm_bo_import(struct gbm_device *gbm, uint32_t type,
               void *buffer, uint32_t usage);