minigbm: rockchip: add NV12 back in as supported format

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

diff --git a/mediatek.c b/mediatek.c
index 5bc839f..22d89d3 100644 (file)
--- a/mediatek.c
+++ b/mediatek.c
@@ -14,35 +14,52 @@
 
 #include "drv_priv.h"
 #include "helpers.h"
+#include "util.h"
+
+static const uint32_t supported_formats[] = {
+       DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888, DRM_FORMAT_RGB565,
+       DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888, DRM_FORMAT_YVU420,
+       DRM_FORMAT_YVU420_ANDROID
+};
+
+static int mediatek_init(struct driver *drv)
+{
+       return drv_add_linear_combinations(drv, supported_formats,
+                                          ARRAY_SIZE(supported_formats));
+}
 
 static int mediatek_bo_create(struct bo *bo, uint32_t width, uint32_t height,
                              uint32_t format, uint32_t flags)
 {
-       size_t size;
-       struct drm_mtk_gem_create gem_create;
        int ret;
+       size_t plane;
+       struct drm_mtk_gem_create gem_create;
+       uint32_t bytes_per_pixel = drv_stride_from_format(format, 1, 0);
 
-       bo->strides[0] = drv_stride_from_format(format, width, 0);
-       size = height * bo->strides[0];
+       /*
+        * Since the ARM L1 cache line size is 64 bytes, align to that as a
+        * performance optimization.
+        */
+       width = ALIGN(width, DIV_ROUND_UP(64, bytes_per_pixel));
+       drv_bo_from_format(bo, width, height, format);
 
        memset(&gem_create, 0, sizeof(gem_create));
-       gem_create.size = size;
+       gem_create.size = bo->total_size;
 
        ret = drmIoctl(bo->drv->fd, DRM_IOCTL_MTK_GEM_CREATE, &gem_create);
        if (ret) {
                fprintf(stderr, "drv: DRM_IOCTL_MTK_GEM_CREATE failed "
-                               "(size=%zu)\n", size);
+                               "(size=%llu)\n", gem_create.size);
                return ret;
        }
 
-       bo->handles[0].u32 = gem_create.handle;
-       bo->sizes[0] = size;
-       bo->offsets[0] = 0;
+       for (plane = 0; plane < bo->num_planes; plane++)
+               bo->handles[plane].u32 = gem_create.handle;
 
        return 0;
 }
 
-static void *mediatek_bo_map(struct bo *bo)
+static void *mediatek_bo_map(struct bo *bo, struct map_info *data, size_t plane)
 {
        int ret;
        struct drm_mtk_gem_map_off gem_map;
@@ -56,32 +73,34 @@ static void *mediatek_bo_map(struct bo *bo)
                return MAP_FAILED;
        }
 
-       return mmap(0, bo->sizes[0], PROT_READ | PROT_WRITE, MAP_SHARED,
+       data->length = bo->total_size;
+
+       return mmap(0, bo->total_size, PROT_READ | PROT_WRITE, MAP_SHARED,
                    bo->drv->fd, gem_map.offset);
 }
 
-const struct backend backend_mediatek =
+static uint32_t mediatek_resolve_format(uint32_t format)
+{
+       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;
+       default:
+               return format;
+       }
+}
+
+struct backend backend_mediatek =
 {
        .name = "mediatek",
+       .init = mediatek_init,
        .bo_create = mediatek_bo_create,
        .bo_destroy = drv_gem_bo_destroy,
+       .bo_import = drv_prime_bo_import,
        .bo_map = mediatek_bo_map,
-       .format_list = {
-               {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR |
-                                     DRV_BO_USE_RENDERING | DRV_BO_USE_HW_TEXTURE |
-                                     DRV_BO_USE_HW_RENDER | DRV_BO_USE_HW_2D |
-                                     DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
-               {DRV_FORMAT_XRGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR |
-                                     DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN |
-                                     DRV_BO_USE_SW_WRITE_OFTEN},
-               {DRV_FORMAT_ARGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR |
-                                     DRV_BO_USE_RENDERING | DRV_BO_USE_HW_TEXTURE |
-                                     DRV_BO_USE_HW_RENDER | DRV_BO_USE_HW_2D |
-                                     DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
-               {DRV_FORMAT_ARGB8888, DRV_BO_USE_SCANOUT | DRV_BO_USE_CURSOR |
-                                     DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN |
-                                     DRV_BO_USE_SW_WRITE_OFTEN},
-       }
+       .resolve_format = mediatek_resolve_format,
 };
 
 #endif