commit 06fb002d01d3a837ef54251713472d41845cddc7
author Jason Macnak <natsu@google.com> Thu Jun 11 22:32:34 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 11 22:32:34 2020 +0000
tree 8166b03e309e55786e7a5545001db95e3028308c
parent dd7a2f10153c97f5259163334444993eb29efa00
parent a07fb5901a7809aa2ad8a1eb3c2f2a6dcf6f742d

gralloc: Use YVU420_ANDROID for YCbCr flex am: 06d77b4e7d am: a07fb5901a

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/minigbm/+/11817987

Change-Id: I7455578ef9594a643ef2b5d304687cc73ddadd3c

virtio_gpu.c

diff --git a/virtio_gpu.c b/virtio_gpu.c
index 83d46d3..ed67693 100644
--- a/virtio_gpu.c
+++ b/virtio_gpu.c
@@ -631,6 +631,9 @@
 	drv_modify_combination(drv, DRM_FORMAT_YVU420, &LINEAR_METADATA,
 			       BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_HW_VIDEO_DECODER |
 				   BO_USE_HW_VIDEO_ENCODER | BO_USE_RENDERSCRIPT);
+	drv_modify_combination(drv, DRM_FORMAT_YVU420_ANDROID, &LINEAR_METADATA,
+			       BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_HW_VIDEO_DECODER |
+				   BO_USE_HW_VIDEO_ENCODER | BO_USE_RENDERSCRIPT);
 	drv_modify_combination(drv, DRM_FORMAT_R8, &LINEAR_METADATA,
 			       BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_HW_VIDEO_DECODER);
 	drv_modify_combination(drv, DRM_FORMAT_R16, &LINEAR_METADATA,
@@ -829,7 +832,7 @@
 		if (features[feat_3d].enabled)
 			return DRM_FORMAT_NV12;
 		else
-			return DRM_FORMAT_YVU420;
+			return DRM_FORMAT_YVU420_ANDROID;
 	default:
 		return format;
 	}