From: Gurchetan Singh <gurchetansingh@chromium.org>
Date: Thu, 7 Jun 2018 00:01:51 +0000 (-0700)
Subject: minigbm: add support for BG24
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-minigbm.git;a=commitdiff_plain;h=abe44f62208cfaf1b329703d9043b1004baffb44

minigbm: add support for BG24

Some CTS tests apparently require HAL_PIXEL_FORMAT_RGB_888 now.
This format is DRM_FORMAT_BGR888 in <drm_fourcc.h>.  Let's add it
to the revelant drivers.

BUG=b:80496655
TEST=emerge-eve minigbm, let lab test

Change-Id: Ia9dadbd2c17c137262865679af1d97d55b1a7087
Reviewed-on: https://chromium-review.googlesource.com/1089493
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
---

diff --git a/amdgpu.c b/amdgpu.c
index 83d300c..4d8d222 100644
--- a/amdgpu.c
+++ b/amdgpu.c
@@ -34,8 +34,8 @@ struct amdgpu_priv {
 };
 
 const static uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
-						  DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888,
-						  DRM_FORMAT_XRGB8888 };
+						  DRM_FORMAT_BGR888,   DRM_FORMAT_RGB565,
+						  DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888 };
 
 const static uint32_t texture_source_formats[] = { DRM_FORMAT_GR88, DRM_FORMAT_R8, DRM_FORMAT_NV21,
 						   DRM_FORMAT_NV12, DRM_FORMAT_YVU420_ANDROID };
diff --git a/cros_gralloc/cros_gralloc_helpers.cc b/cros_gralloc/cros_gralloc_helpers.cc
index c09c2b5..12daf4b 100644
--- a/cros_gralloc/cros_gralloc_helpers.cc
+++ b/cros_gralloc/cros_gralloc_helpers.cc
@@ -23,7 +23,7 @@ uint32_t cros_gralloc_convert_format(int format)
 	case HAL_PIXEL_FORMAT_RGB_565:
 		return DRM_FORMAT_RGB565;
 	case HAL_PIXEL_FORMAT_RGB_888:
-		return DRM_FORMAT_RGB888;
+		return DRM_FORMAT_BGR888;
 	case HAL_PIXEL_FORMAT_RGBA_8888:
 		return DRM_FORMAT_ABGR8888;
 	case HAL_PIXEL_FORMAT_RGBX_8888:
diff --git a/i915.c b/i915.c
index 6df6dcc..a88db6a 100644
--- a/i915.c
+++ b/i915.c
@@ -23,10 +23,10 @@
 #define I915_CACHELINE_MASK (I915_CACHELINE_SIZE - 1)
 
 static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888,    DRM_FORMAT_ARGB1555,
-						  DRM_FORMAT_ARGB8888,    DRM_FORMAT_RGB565,
-						  DRM_FORMAT_XBGR2101010, DRM_FORMAT_XBGR8888,
-						  DRM_FORMAT_XRGB1555,    DRM_FORMAT_XRGB2101010,
-						  DRM_FORMAT_XRGB8888 };
+						  DRM_FORMAT_ARGB8888,    DRM_FORMAT_BGR888,
+						  DRM_FORMAT_RGB565,      DRM_FORMAT_XBGR2101010,
+						  DRM_FORMAT_XBGR8888,    DRM_FORMAT_XRGB1555,
+						  DRM_FORMAT_XRGB2101010, DRM_FORMAT_XRGB8888 };
 
 static const uint32_t tileable_texture_source_formats[] = { DRM_FORMAT_GR88, DRM_FORMAT_R8,
 							    DRM_FORMAT_UYVY, DRM_FORMAT_YUYV };
diff --git a/mediatek.c b/mediatek.c
index cfb60b3..64c410f 100644
--- a/mediatek.c
+++ b/mediatek.c
@@ -24,8 +24,8 @@ struct mediatek_private_map_data {
 };
 
 static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
-						  DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888,
-						  DRM_FORMAT_XRGB8888 };
+						  DRM_FORMAT_BGR888,   DRM_FORMAT_RGB565,
+						  DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888 };
 
 static const uint32_t texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_YVU420,
 						   DRM_FORMAT_YVU420_ANDROID };
diff --git a/msm.c b/msm.c
index fe09de0..420abfd 100644
--- a/msm.c
+++ b/msm.c
@@ -13,7 +13,8 @@
 #define MESA_LLVMPIPE_TILE_ORDER 6
 #define MESA_LLVMPIPE_TILE_SIZE (1 << MESA_LLVMPIPE_TILE_ORDER)
 
-static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888 };
+static const uint32_t render_target_formats[] = { DRM_FORMAT_ARGB8888, DRM_FORMAT_BGR888,
+						  DRM_FORMAT_XRGB8888 };
 
 static int msm_init(struct driver *drv)
 {
diff --git a/rockchip.c b/rockchip.c
index a0d9141..a53a915 100644
--- a/rockchip.c
+++ b/rockchip.c
@@ -24,8 +24,8 @@ struct rockchip_private_map_data {
 };
 
 static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
-						  DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888,
-						  DRM_FORMAT_XRGB8888 };
+						  DRM_FORMAT_BGR888,   DRM_FORMAT_RGB565,
+						  DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888 };
 
 static const uint32_t texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_NV12,
 						   DRM_FORMAT_YVU420, DRM_FORMAT_YVU420_ANDROID };
diff --git a/virtio_gpu.c b/virtio_gpu.c
index 5200b3d..e5729ae 100644
--- a/virtio_gpu.c
+++ b/virtio_gpu.c
@@ -26,8 +26,8 @@
 #define MESA_LLVMPIPE_TILE_SIZE (1 << MESA_LLVMPIPE_TILE_ORDER)
 
 static const uint32_t render_target_formats[] = { DRM_FORMAT_ABGR8888, DRM_FORMAT_ARGB8888,
-						  DRM_FORMAT_RGB565, DRM_FORMAT_XBGR8888,
-						  DRM_FORMAT_XRGB8888 };
+						  DRM_FORMAT_BGR888,   DRM_FORMAT_RGB565,
+						  DRM_FORMAT_XBGR8888, DRM_FORMAT_XRGB8888 };
 
 static const uint32_t dumb_texture_source_formats[] = { DRM_FORMAT_R8, DRM_FORMAT_YVU420,
 							DRM_FORMAT_YVU420_ANDROID };