summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaiyi Li <kaiyili@google.com>2024-01-17 10:36:26 -0800
committerKaiyi Li <kaiyili@google.com>2024-01-17 10:47:21 -0800
commit958b64a56b8a9791c6118cf53ec45e2de2aa75d9 (patch)
treeb53705ca98c24faac7809cc24441a8d10c180ba0
parent8933de390aef732ccb5e5ff4f71bcfb7e89a0876 (diff)
downloadvirtual-device-958b64a56b8a9791c6118cf53ec45e2de2aa75d9.tar.gz
Revert "ANDROID: drm/virtgpu api: create from guest handle"
This reverts commit 793822aea10df327db8a53374140b5c306cc308b. Change-Id: I6fd8d368f4143c2028958cf08714963694fe6bce
-rw-r--r--uapi/drm/virtgpu_drm.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/uapi/drm/virtgpu_drm.h b/uapi/drm/virtgpu_drm.h
index c41b57d..a0b6e02 100644
--- a/uapi/drm/virtgpu_drm.h
+++ b/uapi/drm/virtgpu_drm.h
@@ -82,7 +82,6 @@ struct drm_virtgpu_execbuffer {
#define VIRTGPU_PARAM_CROSS_DEVICE 5 /* Cross virtio-device resource sharing */
#define VIRTGPU_PARAM_CONTEXT_INIT 6 /* DRM_VIRTGPU_CONTEXT_INIT */
#define VIRTGPU_PARAM_SUPPORTED_CAPSET_IDs 7 /* Bitmask of supported capability set ids */
-#define VIRTGPU_PARAM_CREATE_GUEST_HANDLE 8 /* Host OS handle can be created from guest memory. */
struct drm_virtgpu_getparam {
__u64 param;
@@ -161,10 +160,9 @@ struct drm_virtgpu_resource_create_blob {
#define VIRTGPU_BLOB_MEM_HOST3D 0x0002
#define VIRTGPU_BLOB_MEM_HOST3D_GUEST 0x0003
-#define VIRTGPU_BLOB_FLAG_USE_MAPPABLE 0x0001
-#define VIRTGPU_BLOB_FLAG_USE_SHAREABLE 0x0002
-#define VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE 0x0004
-#define VIRTGPU_BLOB_FLAG_CREATE_GUEST_HANDLE 0x0008
+#define VIRTGPU_BLOB_FLAG_USE_MAPPABLE 0x0001
+#define VIRTGPU_BLOB_FLAG_USE_SHAREABLE 0x0002
+#define VIRTGPU_BLOB_FLAG_USE_CROSS_DEVICE 0x0004
/* zero is invalid blob_mem */
__u32 blob_mem;
__u32 blob_flags;
@@ -173,9 +171,8 @@ struct drm_virtgpu_resource_create_blob {
__u64 size;
/*
- * for 3D contexts with VIRTGPU_BLOB_MEM_HOST3D_GUEST, VIRTGPU_BLOB_MEM_HOST3D,
- * VIRTGPU_BLOB_MEM_GUEST + VIRTGPU_BLOB_FLAG_CREATE_GUEST_HANDLE.
- * Otherwise, must be zero.
+ * for 3D contexts with VIRTGPU_BLOB_MEM_HOST3D_GUEST and
+ * VIRTGPU_BLOB_MEM_HOST3D otherwise, must be zero.
*/
__u32 pad;
__u32 cmd_size;