diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-25 12:49:07 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-25 12:49:07 +0000 |
| commit | 59a568b57848b10e8a44518a889323f12ccdd8f4 (patch) | |
| tree | b686b058f54ee4bebec1b13e8c90f4d9f1768595 /hw/display/virtio-gpu-3d.c | |
| parent | 8a4c08b16187c238f05aa783c8deedb8099e940d (diff) | |
| parent | 1ed2cb32dc9e8f74c82bdc567edad717b0f34fa5 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190222-pull-request' into staging
vga: bugfixes and edid support for virtio-vga
# gpg: Signature made Fri 22 Feb 2019 08:24:25 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20190222-pull-request:
display/virtio: add edid support.
virtio-gpu: remove useless 'waiting' field
virtio-gpu: block both 2d and 3d rendering
virtio-gpu: remove unused config_size
virtio-gpu: remove unused qdev
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/display/virtio-gpu-3d.c')
| -rw-r--r-- | hw/display/virtio-gpu-3d.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c index bc6e99c943..2d302526ab 100644 --- a/hw/display/virtio-gpu-3d.c +++ b/hw/display/virtio-gpu-3d.c @@ -404,11 +404,6 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, { VIRTIO_GPU_FILL_CMD(cmd->cmd_hdr); - cmd->waiting = g->renderer_blocked; - if (cmd->waiting) { - return; - } - virgl_renderer_force_ctx_0(); switch (cmd->cmd_hdr.type) { case VIRTIO_GPU_CMD_CTX_CREATE: @@ -468,6 +463,9 @@ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, case VIRTIO_GPU_CMD_GET_DISPLAY_INFO: virtio_gpu_get_display_info(g, cmd); break; + case VIRTIO_GPU_CMD_GET_EDID: + virtio_gpu_get_edid(g, cmd); + break; default: cmd->error = VIRTIO_GPU_RESP_ERR_UNSPEC; break; @@ -604,22 +602,6 @@ void virtio_gpu_virgl_reset(VirtIOGPU *g) } } -void virtio_gpu_gl_block(void *opaque, bool block) -{ - VirtIOGPU *g = opaque; - - if (block) { - g->renderer_blocked++; - } else { - g->renderer_blocked--; - } - assert(g->renderer_blocked >= 0); - - if (g->renderer_blocked == 0) { - virtio_gpu_process_cmdq(g); - } -} - int virtio_gpu_virgl_init(VirtIOGPU *g) { int ret; |