[automerger skipped] Adds Android.bp files back after merge. am: 1e4aff7321 -s ours

[android-x86/external-minigbm.git] / gbm.c

diff --git a/gbm.c b/gbm.c
index 4b62bbf..ab5b3f7 100644 (file)
--- a/gbm.c
+++ b/gbm.c
@@ -210,13 +210,17 @@ PUBLIC struct gbm_bo *gbm_bo_import(struct gbm_device *gbm, uint32_t type, void
                drv_data.format = fd_data->format;
                drv_data.fds[0] = fd_data->fd;
                drv_data.strides[0] = fd_data->stride;
+
+               for (i = 0; i < GBM_MAX_PLANES; ++i)
+                       drv_data.format_modifiers[i] = DRM_FORMAT_MOD_INVALID;
                break;
        case GBM_BO_IMPORT_FD_MODIFIER:
                gbm_format = fd_modifier_data->format;
                drv_data.width = fd_modifier_data->width;
                drv_data.height = fd_modifier_data->height;
                drv_data.format = fd_modifier_data->format;
-               num_planes = drv_num_planes_from_format(drv_data.format);
+               num_planes = drv_num_planes_from_modifier(gbm->drv, drv_data.format,
+                                                         fd_modifier_data->modifier);
                assert(num_planes);
 
                num_fds = fd_modifier_data->num_fds;