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 /hw/display/virtio-gpu.c | |
| parent | 438cd7082c70b9e93a26ff4e2e83ac3f6a0027c2 (diff) | |
| parent | 5643cc94ac1cbc23e1ba6b16b6a88e1ce7b3f6a9 (diff) | |
| download | focaccia-qemu-3ec7b5d819da9245dd37a6f7e7d150f064cf584c.tar.gz focaccia-qemu-3ec7b5d819da9245dd37a6f7e7d150f064cf584c.zip | |
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 'hw/display/virtio-gpu.c')
| -rw-r--r-- | hw/display/virtio-gpu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 6658f6c6a6..2dd3c3481a 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -1215,7 +1215,12 @@ static void virtio_gpu_device_realize(DeviceState *qdev, Error **errp) /* use larger control queue in 3d mode */ g->ctrl_vq = virtio_add_queue(vdev, 256, virtio_gpu_handle_ctrl_cb); g->cursor_vq = virtio_add_queue(vdev, 16, virtio_gpu_handle_cursor_cb); - g->virtio_config.num_capsets = 1; + +#if defined(CONFIG_VIRGL) + g->virtio_config.num_capsets = virtio_gpu_virgl_get_num_capsets(g); +#else + g->virtio_config.num_capsets = 0; +#endif } else { g->ctrl_vq = virtio_add_queue(vdev, 64, virtio_gpu_handle_ctrl_cb); g->cursor_vq = virtio_add_queue(vdev, 16, virtio_gpu_handle_cursor_cb); |