commit 71bc665179f9e8a94c4b2293f6b3406887f96d34
author Gurchetan Singh <gurchetansingh@chromium.org> Mon Sep 17 17:42:05 2018 -0700
committer chrome-bot <chrome-bot@chromium.org> Fri Sep 21 03:38:13 2018 -0700
tree e36df5079e26f522b357ebba7578b33315244e08
parent 86ddfdc267c0f9b87f37b4639521ecfdd44d5b92

minigbm: don't advertise BGR24 as a render/texture target

Mesa drivers can't use it, in general.

I'm leaving in Rockchip since I haven't gotten any reports
about this test failing on kevin-arcnext.

Fixes: abe44f ("minigbm: add support for BG24")

BUG=b:77876551, b:115564746
TEST=The following tests should pass on Eve/Grunt arc-next:

  android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputAndSampledImage_R8G8B8_UNORM
  android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputCpuRead_R8G8B8_UNORM
  android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuColorOutputIsRenderable_R8G8B8_UNORM
  android.hardware.nativehardware.cts.AHardwareBufferNativeTests#SingleLayer_ColorTest_GpuSampledImageCanBeSampled_R8G8B8_UNORM

Change-Id: Ic7aec07c89fdc21e0c8392238e833f7980062049
Reviewed-on: https://chromium-review.googlesource.com/1229439
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

i915.c

diff --git a/i915.c b/i915.c
index 773fb69..b343e91 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_BGR888,
-						  DRM_FORMAT_RGB565,      DRM_FORMAT_XBGR2101010,
-						  DRM_FORMAT_XBGR8888,    DRM_FORMAT_XRGB1555,
-						  DRM_FORMAT_XRGB2101010, DRM_FORMAT_XRGB8888 };
+						  DRM_FORMAT_ARGB8888,    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 };
@@ -137,6 +137,9 @@
 			     ARRAY_SIZE(tileable_texture_source_formats), &metadata,
 			     texture_use_flags);
 
+	/* Android CTS tests require this. */
+	drv_add_combination(drv, DRM_FORMAT_BGR888, &metadata, BO_USE_SW_MASK);
+
 	drv_modify_combination(drv, DRM_FORMAT_XRGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT);
 	drv_modify_combination(drv, DRM_FORMAT_ARGB8888, &metadata, BO_USE_CURSOR | BO_USE_SCANOUT);