diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-02-27 14:01:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-02-27 14:01:19 +0000 |
| commit | 3ec7b5d819da9245dd37a6f7e7d150f064cf584c (patch) | |
| tree | 83e2ab6ef0661c94a071283ccade637a2c21bd7d /include | |
| parent | 438cd7082c70b9e93a26ff4e2e83ac3f6a0027c2 (diff) | |
| parent | 5643cc94ac1cbc23e1ba6b16b6a88e1ce7b3f6a9 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180227-pull-request' into staging
virtio-gpu: add support for second capability set
# gpg: Signature made Tue 27 Feb 2018 07:30:31 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20180227-pull-request:
virtio-gpu-3d: add support for second capability set (v4)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/virtio/virtio-gpu.h | 2 | ||||
| -rw-r--r-- | include/standard-headers/linux/virtio_gpu.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index 83f474ffc3..22ac3c2d0e 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -171,5 +171,5 @@ void virtio_gpu_virgl_fence_poll(VirtIOGPU *g); void virtio_gpu_virgl_reset(VirtIOGPU *g); void virtio_gpu_gl_block(void *opaque, bool block); int virtio_gpu_virgl_init(VirtIOGPU *g); - +int virtio_gpu_virgl_get_num_capsets(VirtIOGPU *g); #endif diff --git a/include/standard-headers/linux/virtio_gpu.h b/include/standard-headers/linux/virtio_gpu.h index c1c8f0751d..52a830dcf8 100644 --- a/include/standard-headers/linux/virtio_gpu.h +++ b/include/standard-headers/linux/virtio_gpu.h @@ -260,6 +260,7 @@ struct virtio_gpu_cmd_submit { }; #define VIRTIO_GPU_CAPSET_VIRGL 1 +#define VIRTIO_GPU_CAPSET_VIRGL2 2 /* VIRTIO_GPU_CMD_GET_CAPSET_INFO */ struct virtio_gpu_get_capset_info { |