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 23b1dd2..22d89d3 100644 (file)
--- a/mediatek.c
+++ b/mediatek.c
@@ -16,31 +16,16 @@
 #include "helpers.h"
 #include "util.h"
 
-static struct supported_combination combos[8] = {
-       {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN |
-               DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
-       {DRM_FORMAT_ARGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
-       {DRM_FORMAT_RGB565, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_CURSOR | DRV_BO_USE_LINEAR | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN},
-       {DRM_FORMAT_XBGR8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_OFTEN | DRV_BO_USE_SW_WRITE_OFTEN |
-               DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
-       {DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
-       {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
-               DRV_BO_USE_RENDERING | DRV_BO_USE_SW_READ_RARELY | DRV_BO_USE_SW_WRITE_RARELY},
+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)
 {
-       drv_insert_combinations(drv, combos, ARRAY_SIZE(combos));
-       return drv_add_kms_flags(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,
@@ -49,7 +34,13 @@ static int mediatek_bo_create(struct bo *bo, uint32_t width, uint32_t height,
        int ret;
        size_t plane;
        struct drm_mtk_gem_create gem_create;
+       uint32_t bytes_per_pixel = drv_stride_from_format(format, 1, 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));
@@ -95,7 +86,7 @@ static uint32_t mediatek_resolve_format(uint32_t format)
                /*HACK: See b/28671744 */
                return DRM_FORMAT_XBGR8888;
        case DRM_FORMAT_FLEX_YCbCr_420_888:
-               return DRM_FORMAT_YVU420;
+               return DRM_FORMAT_YVU420_ANDROID;
        default:
                return format;
        }
@@ -107,6 +98,7 @@ struct backend backend_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,
        .resolve_format = mediatek_resolve_format,
 };