commit f9c5352a5392130cdd75b69e3d9cfbb6c77b592c
author Jason Macnak <natsu@google.com> Tue Jul 19 14:47:18 2022 -0700
committer Hsin-Yi Chen <hsinyichen@google.com> Tue Aug 08 15:29:16 2023 +0800
tree 397b65235ff4f2619c1287298c49f66791651e92
parent 3a7adb42d34c6c67a6396c7a42d27dc0d127376f

virtgpu_virgl: Allow BLOBs with SENSOR_DIRECT_DATA

BUG=b:238609372
TEST= vts -m VtsHalSensorsV2_1TargetTest

Change-Id: I33d9afb41fa546c97faffdbbd996a4d65a5ee156
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/minigbm/+/3774934
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Commit-Queue: Jason Macnak <natsu@google.com>
Tested-by: Jason Macnak <natsu@google.com>
(cherry picked from commit 98d34a82b5f370cdeb685e91118b75546f5fbd56)

virtgpu_virgl.c

diff --git a/virtgpu_virgl.c b/virtgpu_virgl.c
index 5b74744..92b0890 100644
--- a/virtgpu_virgl.c
+++ b/virtgpu_virgl.c
@@ -393,6 +393,7 @@
 	handle_flag(&use_flags, BO_USE_SCANOUT, &bind, VIRGL_BIND_SCANOUT);
 	handle_flag(&use_flags, BO_USE_CURSOR, &bind, VIRGL_BIND_CURSOR);
 	handle_flag(&use_flags, BO_USE_LINEAR, &bind, VIRGL_BIND_LINEAR);
+	handle_flag(&use_flags, BO_USE_SENSOR_DIRECT_DATA, &bind, VIRGL_BIND_LINEAR);
 	handle_flag(&use_flags, BO_USE_GPU_DATA_BUFFER, &bind, VIRGL_BIND_LINEAR);
 	handle_flag(&use_flags, BO_USE_FRONT_RENDERING, &bind, VIRGL_BIND_LINEAR);
 
@@ -620,9 +621,11 @@
 	drv_modify_combination(drv, DRM_FORMAT_NV12, &LINEAR_METADATA,
 			       BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_HW_VIDEO_DECODER |
 				   BO_USE_HW_VIDEO_ENCODER);
+	/* Android VTS sensors hal tests require BO_USE_SENSOR_DIRECT_DATA. */
 	drv_modify_combination(drv, DRM_FORMAT_R8, &LINEAR_METADATA,
 			       BO_USE_CAMERA_READ | BO_USE_CAMERA_WRITE | BO_USE_HW_VIDEO_DECODER |
-				   BO_USE_HW_VIDEO_ENCODER | BO_USE_GPU_DATA_BUFFER);
+				   BO_USE_HW_VIDEO_ENCODER | BO_USE_SENSOR_DIRECT_DATA |
+				   BO_USE_GPU_DATA_BUFFER);
 
 	if (!priv->host_gbm_enabled) {
 		drv_modify_combination(drv, DRM_FORMAT_ABGR8888, &LINEAR_METADATA,