78 lines
2.8 KiB
Diff
78 lines
2.8 KiB
Diff
>From fed782e33714e6a44bca9a8c3ab8b017393e8089 Mon Sep 17 00:00:00 2001
|
|
From: Alon Levy <alevy@redhat.com>
|
|
Date: Sun, 5 Jun 2011 11:01:48 +0300
|
|
Subject: [PATCH 21/28] qxl: add QXL_IO_FLUSH_{SURFACES,RELEASE} for guest
|
|
S3&S4 support
|
|
|
|
Add two new IOs.
|
|
QXL_IO_FLUSH_SURFACES - equivalent to update area for all surfaces, used
|
|
to reduce vmexits from NumSurfaces to 1 on guest S3, S4 and resolution change (windows
|
|
driver implementation is such that this is done on each of those occasions).
|
|
QXL_IO_FLUSH_RELEASE - used to ensure anything on last_release is put on the release ring
|
|
for the client to free.
|
|
|
|
Signed-off-by: Yonit Halperin <yhalperi@redhat.com>
|
|
Signed-off-by: Alon Levy <alevy@redhat.com>
|
|
---
|
|
hw/qxl.c | 30 ++++++++++++++++++++++++++++++
|
|
1 files changed, 30 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/hw/qxl.c b/hw/qxl.c
|
|
index d3109e4..847a9b8 100644
|
|
--- a/hw/qxl.c
|
|
+++ b/hw/qxl.c
|
|
@@ -185,6 +185,13 @@ static void qxl_spice_destroy_surface_wait(PCIQXLDevice *qxl, uint32_t id,
|
|
}
|
|
}
|
|
|
|
+#if SPICE_INTERFACE_QXL_MINOR >= 1
|
|
+static void qxl_spice_flush_surfaces_async(PCIQXLDevice *qxl)
|
|
+{
|
|
+ spice_qxl_flush_surfaces_async(&qxl->ssd.qxl, 0);
|
|
+}
|
|
+#endif
|
|
+
|
|
void qxl_spice_loadvm_commands(PCIQXLDevice *qxl, struct QXLCommandExt *ext,
|
|
uint32_t count)
|
|
{
|
|
@@ -1184,6 +1191,8 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val)
|
|
goto async_common;
|
|
case QXL_IO_DESTROY_ALL_SURFACES_ASYNC:
|
|
io_port = QXL_IO_DESTROY_ALL_SURFACES;
|
|
+ goto async_common;
|
|
+ case QXL_IO_FLUSH_SURFACES_ASYNC:
|
|
async_common:
|
|
async = QXL_ASYNC;
|
|
qemu_mutex_lock(&d->async_lock);
|
|
@@ -1296,6 +1305,27 @@ async_common:
|
|
}
|
|
qxl_spice_destroy_surface_wait(d, val, async);
|
|
break;
|
|
+#if SPICE_INTERFACE_QXL_MINOR >= 1
|
|
+ case QXL_IO_FLUSH_RELEASE: {
|
|
+ QXLReleaseRing *ring = &d->ram->release_ring;
|
|
+ if (ring->prod - ring->cons + 1 == ring->num_items) {
|
|
+ fprintf(stderr,
|
|
+ "ERROR: no flush, full release ring [p%d,%dc]\n",
|
|
+ ring->prod, ring->cons);
|
|
+ }
|
|
+ qxl_push_free_res(d, 1 /* flush */);
|
|
+ dprint(d, 1, "QXL_IO_FLUSH_RELEASE exit (%s, s#=%d, res#=%d,%p)\n",
|
|
+ qxl_mode_to_string(d->mode), d->guest_surfaces.count,
|
|
+ d->num_free_res, d->last_release);
|
|
+ break;
|
|
+ }
|
|
+ case QXL_IO_FLUSH_SURFACES_ASYNC:
|
|
+ dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) (%s, s#=%d, res#=%d)\n",
|
|
+ val, qxl_mode_to_string(d->mode), d->guest_surfaces.count,
|
|
+ d->num_free_res);
|
|
+ qxl_spice_flush_surfaces_async(d);
|
|
+ break;
|
|
+#endif
|
|
case QXL_IO_DESTROY_ALL_SURFACES:
|
|
d->mode = QXL_MODE_UNDEFINED;
|
|
qxl_spice_destroy_surfaces(d, async);
|
|
--
|
|
1.7.5.1
|
|
|