commit e01d9d3b9211a80d04c85e2facbd94de26bd221b
author Linux Build Service Account <lnxbuild@localhost> Wed Jul 08 11:57:06 2020 -0700
committer Linux Build Service Account <lnxbuild@localhost> Wed Jul 08 11:57:06 2020 -0700
tree 8166b03e309e55786e7a5545001db95e3028308c
parent fdc82975d06cb6c90fbe655ea35db52e66864db1
parent 74bd817acb1142444f744e54dfbc28c1a5035bf7

Merge 74bd817acb1142444f744e54dfbc28c1a5035bf7 on remote branch

Change-Id: I759c804cdbcf4a1fe90749cb621ee030589a8575

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;
 	}