commit 88b01c811653bae5b1b0c31591bec3099b0f7343
author android-build-team Robot <android-build-team-robot@google.com> Fri Jun 12 01:01:03 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 12 01:01:03 2020 +0000
tree 8166b03e309e55786e7a5545001db95e3028308c
parent 457b146f1e7caa7f612cc27a8b5f16d21ba12ce0
parent a07fb5901a7809aa2ad8a1eb3c2f2a6dcf6f742d

Snap for 6582601 from a07fb5901a7809aa2ad8a1eb3c2f2a6dcf6f742d to rvc-d1-release

Change-Id: I0481ad29ab2add7eaabb47571007297fcfca53d7

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