commit 983b681e8758f7e02d97c208cbf4e88569021072
author android-build-team Robot <android-build-team-robot@google.com> Fri Jun 12 07:05:54 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 12 07:05:54 2020 +0000
tree 8166b03e309e55786e7a5545001db95e3028308c
parent bb326a268b29be6ed6f7d392f441ce0692b957aa
parent 7a1eec2a3310343a52dd0aa09f7c5de2198c20c9

Snap for 6583806 from 7a1eec2a3310343a52dd0aa09f7c5de2198c20c9 to mainline-release

Change-Id: Id4c385fcdb8c554677452313136cc079fbd3a8c8

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