From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33551) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QgdRo-0004wZ-AX for qemu-devel@nongnu.org; Tue, 12 Jul 2011 09:56:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QgdRl-0008O0-BL for qemu-devel@nongnu.org; Tue, 12 Jul 2011 09:56:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10084) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QgdRk-0008Nd-Nm for qemu-devel@nongnu.org; Tue, 12 Jul 2011 09:56:21 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p6CDuJVA027027 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 12 Jul 2011 09:56:19 -0400 From: Alon Levy Date: Tue, 12 Jul 2011 16:55:32 +0300 Message-Id: <1310478932-25370-20-git-send-email-alevy@redhat.com> In-Reply-To: <1310478932-25370-1-git-send-email-alevy@redhat.com> References: <1310478932-25370-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCHv3] qxl: add QXL_IO_FLUSH_{SURFACES, RELEASE} for guest S3&S4 support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kraxel@redhat.com 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. Cc: Yonit Halperin --- hw/qxl.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 1d6acce..a9cc1a3 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -181,6 +181,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) +{ + qxl->ssd.worker->flush_surfaces_async(qxl->ssd.worker, 0); +} +#endif + void qxl_spice_loadvm_commands(PCIQXLDevice *qxl, struct QXLCommandExt *ext, uint32_t count) { @@ -1195,6 +1202,7 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) case QXL_IO_DESTROY_PRIMARY_ASYNC: case QXL_IO_DESTROY_SURFACE_ASYNC: case QXL_IO_DESTROY_ALL_SURFACES_ASYNC: + case QXL_IO_FLUSH_SURFACES_ASYNC: #if SPICE_INTERFACE_QXL_MINOR < 1 fprintf(stderr, "qxl: error: async not supported by libspice but guest driver used it\n"); return; @@ -1322,6 +1330,30 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) } qxl_spice_destroy_surface_wait(d, val, async); break; + 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: +#if SPICE_INTERFACE_QXL_MINOR >= 1 + 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); +#else + dprint(d, 1, "QXL_IO_FLUSH_SURFACES_ASYNC (%d) ignored, too old spice server\n", + val); +#endif + break; case QXL_IO_DESTROY_ALL_SURFACES_ASYNC: case QXL_IO_DESTROY_ALL_SURFACES: d->mode = QXL_MODE_UNDEFINED; -- 1.7.6