minigbm: support YV12 with frequent software access

android.media and android.mediastresss use this combination a lot.

BUG=b:34422476
TEST=run cts -c android.media.cts.AdaptivePlaybackTest -m testH263_adaptiveDrc
     passes on cyan

Change-Id: I906c601f24b8454ab98e7297ac663bfe85f55589
Reviewed-on: https://chromium-review.googlesource.com/430200
Commit-Ready: Gurchetan Singh <gurchetansingh@chromium.org>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>

diff --git a/i915.c b/i915.c
index 1ed1609..2c6645b 100644 (file)
--- a/i915.c
+++ b/i915.c
@@ -17,7 +17,7 @@
 #include "helpers.h"
 #include "util.h"
 
-static struct supported_combination combos[18] = {
+static struct supported_combination combos[19] = {
        {DRM_FORMAT_ARGB1555, DRM_FORMAT_MOD_NONE,
                BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE,
@@ -54,6 +54,8 @@ static struct supported_combination combos[18] = {
                BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
                BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
+       {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
+               BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
 };
 
 struct i915_device

diff --git a/rockchip.c b/rockchip.c
index 84aa8cc..f039449 100644 (file)
--- a/rockchip.c
+++ b/rockchip.c
@@ -17,7 +17,7 @@
 #include "helpers.h"
 #include "util.h"
 
-static struct supported_combination combos[11] = {
+static struct supported_combination combos[12] = {
        {DRM_FORMAT_ABGR8888, DRM_FORMAT_MOD_NONE,
                BO_USE_RENDERING | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN |
                BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
@@ -42,6 +42,8 @@ static struct supported_combination combos[11] = {
                BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
        {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
                BO_USE_RENDERING | BO_USE_SW_READ_RARELY | BO_USE_SW_WRITE_RARELY},
+       {DRM_FORMAT_YVU420, DRM_FORMAT_MOD_NONE,
+               BO_USE_LINEAR | BO_USE_SW_READ_OFTEN | BO_USE_SW_WRITE_OFTEN},
 };
 
 static int afbc_bo_from_format(struct bo *bo, uint32_t width, uint32_t height,