minigbm: cros_gralloc: support GRALLOC_MODULE_API_VERSION_0_3

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

diff --git a/virtio_gpu.c b/virtio_gpu.c
index 5780600..fe580cd 100644 (file)
--- a/virtio_gpu.c
+++ b/virtio_gpu.c
@@ -37,19 +37,24 @@ static int virtio_gpu_init(struct driver *drv)
 static int virtio_gpu_bo_create(struct bo *bo, uint32_t width, uint32_t height, uint32_t format,
                                uint32_t flags)
 {
-       int ret = drv_dumb_bo_create(bo, ALIGN(width, MESA_LLVMPIPE_TILE_SIZE),
-                                    ALIGN(height, MESA_LLVMPIPE_TILE_SIZE), format, flags);
-       return ret;
+       width = ALIGN(width, MESA_LLVMPIPE_TILE_SIZE);
+       height = ALIGN(height, MESA_LLVMPIPE_TILE_SIZE);
+
+       /* HAL_PIXEL_FORMAT_YV12 requires that the buffer's height not be aligned. */
+       if (bo->format == DRM_FORMAT_YVU420_ANDROID)
+               height = bo->height;
+
+       return drv_dumb_bo_create(bo, width, height, format, flags);
 }
 
-static uint32_t virtio_gpu_resolve_format(uint32_t format)
+static uint32_t virtio_gpu_resolve_format(uint32_t format, uint64_t usage)
 {
        switch (format) {
        case DRM_FORMAT_FLEX_IMPLEMENTATION_DEFINED:
                /*HACK: See b/28671744 */
                return DRM_FORMAT_XBGR8888;
        case DRM_FORMAT_FLEX_YCbCr_420_888:
-               return DRM_FORMAT_YVU420_ANDROID;
+               return DRM_FORMAT_YVU420;
        default:
                return format;
        }