summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Macnak <natsu@google.com>2022-07-19 14:47:18 -0700
committerHsin-Yi Chen <hsinyichen@google.com>2023-08-08 15:29:16 +0800
commitf9c5352a5392130cdd75b69e3d9cfbb6c77b592c (patch)
tree397b65235ff4f2619c1287298c49f66791651e92
parent3a7adb42d34c6c67a6396c7a42d27dc0d127376f (diff)
downloadminigbm-android11-gsi.tar.gz
virtgpu_virgl: Allow BLOBs with SENSOR_DIRECT_DATAandroid11-gsi
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)
-rw-r--r--virtgpu_virgl.c5
1 files changed, 4 insertions, 1 deletions
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 @@ static uint32_t compute_virgl_bind_flags(uint64_t use_flags, uint32_t format)
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 @@ static int virgl_init(struct driver *drv)
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,