Merge remote-tracking branch 'goog/mirror-aosp-master' into 'goog/tm-dev'
... to update Minigbm for Goldfish to pull in P010 support from
https://crrev.com/c/3579857
Bug: b/191084459
Test: cvd start --gpu_mode=gfxstream
Test: Camera2Video sample app
Test: cts -m CtsCameraTestCases
Change-Id: I1257909949c4831fbbc3064cea269c429da16748
(cherry picked from commit 722a08bb8ac941fb2a077b63673a805c5527c651)
Merged-In: I1257909949c4831fbbc3064cea269c429da16748
diff --git a/virtgpu_cross_domain.c b/virtgpu_cross_domain.c
index 85ea1a3..10930fc 100644
--- a/virtgpu_cross_domain.c
+++ b/virtgpu_cross_domain.c
@@ -239,14 +239,6 @@
if (!params[param_host_visible].value && !params[param_create_guest_handle].value)
return -ENOTSUP;
- /*
- * crosvm never reports the fake capset. This is just an extra check to make sure we
- * don't use the cross-domain context by accident. Developers may remove this for
- * testing purposes.
- */
- if ((params[param_supported_capset_ids].value & (1 << CAPSET_CROSS_FAKE)) == 0)
- return -ENOTSUP;
-
priv = calloc(1, sizeof(*priv));
if (!priv)
return -ENOMEM;
@@ -366,7 +358,7 @@
if (use_flags & BO_USE_SW_MASK)
blob_flags |= VIRTGPU_BLOB_FLAG_USE_MAPPABLE;
- if (params[param_cross_device].value && (use_flags & BO_USE_NON_GPU_HW))
+ if (params[param_cross_device].value)
blob_flags |= VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE;
/// It may be possible to have host3d blobs and handles from guest memory at the same time.