[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PULL 2/5] Revert "virtio-gpu: fix crashes upon warm reboot w
From: |
Gerd Hoffmann |
Subject: |
[Qemu-arm] [PULL 2/5] Revert "virtio-gpu: fix crashes upon warm reboot with vga mode" |
Date: |
Mon, 3 Sep 2018 08:57:42 +0200 |
This reverts commit 93f874fe9dbe0b997b5a9459840957efd13d7191.
Now with virtio-vga being resetted properly the
crash workaround is not needed any more.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
---
include/hw/virtio/virtio-gpu.h | 1 -
hw/display/virtio-gpu.c | 5 -----
hw/display/virtio-vga.c | 11 -----------
3 files changed, 17 deletions(-)
diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h
index a718b7233f..2374f022e8 100644
--- a/include/hw/virtio/virtio-gpu.h
+++ b/include/hw/virtio/virtio-gpu.h
@@ -125,7 +125,6 @@ typedef struct VirtIOGPU {
uint32_t bytes_3d;
} stats;
- void (*disable_scanout)(struct VirtIOGPU *g, int scanout_id);
Error *migration_blocker;
} VirtIOGPU;
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index d6c9b02b86..1cc953006f 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -421,11 +421,6 @@ static void virtio_gpu_disable_scanout(VirtIOGPU *g, int
scanout_id)
scanout->height ?: 480,
"Guest disabled display.");
}
-
- if (g->disable_scanout) {
- g->disable_scanout(g, scanout_id);
- }
-
dpy_gfx_replace_surface(scanout->con, ds);
scanout->resource_id = 0;
scanout->ds = NULL;
diff --git a/hw/display/virtio-vga.c b/hw/display/virtio-vga.c
index 50c72f26f4..1e601c1a3b 100644
--- a/hw/display/virtio-vga.c
+++ b/hw/display/virtio-vga.c
@@ -75,16 +75,6 @@ static void virtio_vga_gl_block(void *opaque, bool block)
}
}
-static void virtio_vga_disable_scanout(VirtIOGPU *g, int scanout_id)
-{
- VirtIOVGA *vvga = container_of(g, VirtIOVGA, vdev);
-
- if (scanout_id == 0) {
- /* reset surface if needed */
- vvga->vga.graphic_mode = -1;
- }
-}
-
static const GraphicHwOps virtio_vga_ops = {
.invalidate = virtio_vga_invalidate_display,
.gfx_update = virtio_vga_update_display,
@@ -166,7 +156,6 @@ static void virtio_vga_realize(VirtIOPCIProxy *vpci_dev,
Error **errp)
vvga->vga_mrs, true);
vga->con = g->scanout[0].con;
- g->disable_scanout = virtio_vga_disable_scanout;
graphic_console_set_hwops(vga->con, &virtio_vga_ops, vvga);
for (i = 0; i < g->conf.max_outputs; i++) {
--
2.9.3
- [Qemu-arm] [PULL 0/5] Vga 20180903 patches, Gerd Hoffmann, 2018/09/03
- [Qemu-arm] [PULL 1/5] virtio-vga: fix reset, Gerd Hoffmann, 2018/09/03
- [Qemu-arm] [PULL 2/5] Revert "virtio-gpu: fix crashes upon warm reboot with vga mode",
Gerd Hoffmann <=
- [Qemu-arm] [PULL 4/5] virtio-gpu: pass down VirtIOGPU pointer to a bunch of functions, Gerd Hoffmann, 2018/09/03
- [Qemu-arm] [PULL 5/5] virtio-gpu: add iommu support, Gerd Hoffmann, 2018/09/03
- [Qemu-arm] [PULL 3/5] use dpy_gfx_update_full, Gerd Hoffmann, 2018/09/03
- Re: [Qemu-arm] [PULL 0/5] Vga 20180903 patches, Peter Maydell, 2018/09/24