From patchwork Wed Jul 6 12:19:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 103473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8714DB6F00 for ; Wed, 6 Jul 2011 23:01:38 +1000 (EST) Received: from localhost ([::1]:50830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeRjT-00046t-Df for incoming@patchwork.ozlabs.org; Wed, 06 Jul 2011 09:01:35 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR5G-0001jy-Oc for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:20:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QeR5B-0005Fg-Sj for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:20:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20944) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QeR5B-0005FX-Ax for qemu-devel@nongnu.org; Wed, 06 Jul 2011 08:19:57 -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 p66CJuXA026553 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 6 Jul 2011 08:19:56 -0400 Received: from bow.redhat.com (vpn-10-220.rdu.redhat.com [10.11.10.220]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p66CJR0w022836; Wed, 6 Jul 2011 08:19:55 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Wed, 6 Jul 2011 14:19:25 +0200 Message-Id: <1309954766-9728-17-git-send-email-alevy@redhat.com> In-Reply-To: <1309954766-9728-1-git-send-email-alevy@redhat.com> References: <1309954766-9728-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: yhalperi@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH] qxl: add QXL_IO_FLUSH_{SURFACES, RELEASE} for guest S3&S4 support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 27 +++++++++++++++++++++++++++ hw/qxl.h | 1 + 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 438c6ee..8c7b03b 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -196,6 +196,13 @@ void qxl_spice_destroy_surface_wait(PCIQXLDevice *qxl, uint32_t id) qxl_spice_destroy_surface_wait_async(qxl, id, 0); } +void qxl_spice_flush_surfaces_async(PCIQXLDevice *qxl) +{ + qemu_mutex_lock(&qxl->ssd.wlock); + qxl->ssd.worker->flush_surfaces_async(qxl->ssd.worker); + qemu_mutex_unlock(&qxl->ssd.wlock); +} + void qxl_spice_loadvm_commands(PCIQXLDevice *qxl, struct QXLCommandExt *ext, uint32_t count) { @@ -1176,6 +1183,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: async = 1; if (d->current_async != QXL_UNDEFINED_IO) { qxl_guest_bug(d, "%d async started before last (%d) complete\n", @@ -1292,6 +1300,25 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) case QXL_IO_DESTROY_SURFACE_WAIT: qxl_spice_destroy_surface_wait_async(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: + 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; case QXL_IO_DESTROY_ALL_SURFACES_ASYNC: case QXL_IO_DESTROY_ALL_SURFACES: d->mode = QXL_MODE_UNDEFINED; diff --git a/hw/qxl.h b/hw/qxl.h index e4134b9..d0cf77d 100644 --- a/hw/qxl.h +++ b/hw/qxl.h @@ -123,6 +123,7 @@ void qxl_spice_destroy_surfaces(PCIQXLDevice *qxl); void qxl_spice_destroy_surfaces_async(PCIQXLDevice *qxl, int async); void qxl_spice_reset_image_cache(PCIQXLDevice *qxl); void qxl_spice_reset_cursor(PCIQXLDevice *qxl); +void qxl_spice_flush_surfaces_async(PCIQXLDevice *qxl); /* qxl-logger.c */ void qxl_log_cmd_cursor(PCIQXLDevice *qxl, QXLCursorCmd *cmd, int group_id);