minigbm: fix YUV bpp size issue

i915: add UYVY support

BUG=None
TEST=Auron/BDW

Change-Id: I78f26ab29d8bf3a43a09b23677fefffd70e5871d
Reviewed-on: https://chromium-review.googlesource.com/308226
Commit-Ready: William Xie <william.xie@intel.com>
Tested-by: William Xie <william.xie@intel.com>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: William Xie <william.xie@intel.com>

diff --git a/helpers.c b/helpers.c
index 2b72f1a..a9673df 100644 (file)
--- a/helpers.c
+++ b/helpers.c
@@ -44,6 +44,10 @@ int gbm_bpp_from_format(uint32_t format)
                case GBM_FORMAT_BGRA5551:
                case GBM_FORMAT_RGB565:
                case GBM_FORMAT_BGR565:
+               case GBM_FORMAT_YUYV:
+               case GBM_FORMAT_YVYU:
+               case GBM_FORMAT_UYVY:
+               case GBM_FORMAT_VYUY:
                        return 16;
 
                case GBM_FORMAT_RGB888:
@@ -66,10 +70,6 @@ int gbm_bpp_from_format(uint32_t format)
                case GBM_FORMAT_ABGR2101010:
                case GBM_FORMAT_RGBA1010102:
                case GBM_FORMAT_BGRA1010102:
-               case GBM_FORMAT_YUYV:
-               case GBM_FORMAT_YVYU:
-               case GBM_FORMAT_UYVY:
-               case GBM_FORMAT_VYUY:
                case GBM_FORMAT_AYUV:
                        return 32;
        }

diff --git a/i915.c b/i915.c
index 511e4f4..53f36b7 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -192,6 +192,8 @@ const struct gbm_driver gbm_driver_i915 =
                {GBM_FORMAT_XRGB1555, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
                {GBM_FORMAT_ARGB1555, GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
                {GBM_FORMAT_RGB565,   GBM_BO_USE_SCANOUT | GBM_BO_USE_CURSOR | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
+               {GBM_FORMAT_UYVY,     GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
+               {GBM_FORMAT_YUYV,     GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING | GBM_BO_USE_WRITE},
        }
 };