From 869a7e5bbe8c0e4facc4be2edbd676bb6445ffe4 Mon Sep 17 00:00:00 2001 From: Gurchetan Singh Date: Thu, 4 Jun 2020 13:37:36 -0700 Subject: [PATCH] ANDROID: virtio_gpu.h: move map/unmap to 3d group This is an experimental UAPI, without which it would be impossible to virtualize Vulkan on Android using virtgpu. This matches virtio-spec and latest upstream proposals: https://markmail.org/message/akx5yzrubjcutefl https://gitlab.freedesktop.org/virgl/drm-misc-next/-/tree/resource-blob crosvm has been updated to reflect the latest proposals. Once the aosp crosvm is updated, Vulkan will break on Cuttlefish. As such, we must update crosvm and the respective kernels at the same time. First step: update the kernels, as this change does. This is not a new feature, just maintainence and convergence on an existing one. Bug: 153580313 TEST=compile Change-Id: I3305503264eb6859ace32376fdc91b2ee7cc10e7 Signed-off-by: Gurchetan Singh --- include/uapi/linux/virtio_gpu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/virtio_gpu.h b/include/uapi/linux/virtio_gpu.h index f44af31f7990..f67d443077cd 100644 --- a/include/uapi/linux/virtio_gpu.h +++ b/include/uapi/linux/virtio_gpu.h @@ -85,8 +85,6 @@ enum virtio_gpu_ctrl_type { VIRTIO_GPU_CMD_GET_EDID, VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID, VIRTIO_GPU_CMD_RESOURCE_CREATE_BLOB, - VIRTIO_GPU_CMD_RESOURCE_MAP, - VIRTIO_GPU_CMD_RESOURCE_UNMAP, /* 3d commands */ VIRTIO_GPU_CMD_CTX_CREATE = 0x0200, @@ -97,6 +95,8 @@ enum virtio_gpu_ctrl_type { VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D, VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D, VIRTIO_GPU_CMD_SUBMIT_3D, + VIRTIO_GPU_CMD_RESOURCE_MAP, + VIRTIO_GPU_CMD_RESOURCE_UNMAP, /* cursor commands */ VIRTIO_GPU_CMD_UPDATE_CURSOR = 0x0300,