summary refs log tree commit diff
path: root/devices/src/virtio/gpu/protocol.rs
diff options
context:
space:
mode:
authorGurchetan Singh <gurchetansingh@chromium.org>2018-10-02 16:07:26 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-10-05 15:43:20 -0700
commit046df60760f3b0691f23c27a7f24a96c9afe8c05 (patch)
treed8f0e1df72be13ca5e2433b1a6c3968c362ce018 /devices/src/virtio/gpu/protocol.rs
parentb1570f2672ada3f5c4b9592887186413d80e66de (diff)
downloadcrosvm-046df60760f3b0691f23c27a7f24a96c9afe8c05.tar
crosvm-046df60760f3b0691f23c27a7f24a96c9afe8c05.tar.gz
crosvm-046df60760f3b0691f23c27a7f24a96c9afe8c05.tar.bz2
crosvm-046df60760f3b0691f23c27a7f24a96c9afe8c05.tar.lz
crosvm-046df60760f3b0691f23c27a7f24a96c9afe8c05.tar.xz
crosvm-046df60760f3b0691f23c27a7f24a96c9afe8c05.tar.zst
crosvm-046df60760f3b0691f23c27a7f24a96c9afe8c05.zip
virtio-gpu: use the newest caps
capset2 has many new features. We currently hardcode num_capsets
to 1, however our Mesa/guest kernel/virglrenderer are new enough
to support caps v2.

We could attempt to do negotiation (see virtio_gpu_virgl_get_num_capset
in QEMU), but virtio::gpu::Gpu::get_config actually comes before
virtio::gpu::Gpu::activate. To support older Mesa/guest kernel/virglrenderer
configurations, this must be refactored.

BUG=none
TEST=get a gles31 context on tatl

Change-Id: I8d9ed54774a63da2ec5a4ba86187330521785566
Reviewed-on: https://chromium-review.googlesource.com/1258323
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Gurchetan Singh <gurchetansingh@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Diffstat (limited to 'devices/src/virtio/gpu/protocol.rs')
-rw-r--r--devices/src/virtio/gpu/protocol.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/devices/src/virtio/gpu/protocol.rs b/devices/src/virtio/gpu/protocol.rs
index c0fbfc3..1c9b1c3 100644
--- a/devices/src/virtio/gpu/protocol.rs
+++ b/devices/src/virtio/gpu/protocol.rs
@@ -369,7 +369,8 @@ pub struct virtio_gpu_cmd_submit {
 
 unsafe impl DataInit for virtio_gpu_cmd_submit {}
 
-const VIRTIO_GPU_CAPSET_VIRGL: u32 = 1;
+pub const VIRTIO_GPU_CAPSET_VIRGL: u32 = 1;
+pub const VIRTIO_GPU_CAPSET_VIRGL2: u32 = 2;
 
 /* VIRTIO_GPU_CMD_GET_CAPSET_INFO */
 #[derive(Copy, Clone, Debug)]