From patchwork Fri Jun 24 13:02:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 101817 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 6997DB6F87 for ; Sat, 25 Jun 2011 00:57:37 +1000 (EST) Received: from localhost ([::1]:53615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa7p8-0002i9-3y for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2011 10:57:34 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49462) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa62m-00067q-SS for qemu-devel@nongnu.org; Fri, 24 Jun 2011 09:03:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qa62h-0001u5-Vz for qemu-devel@nongnu.org; Fri, 24 Jun 2011 09:03:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qa62g-0001tW-T9 for qemu-devel@nongnu.org; Fri, 24 Jun 2011 09:03:27 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p5OD3P87011327 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 24 Jun 2011 09:03:26 -0400 Received: from bow.redhat.com (vpn-11-77.rdu.redhat.com [10.11.11.77]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p5OD34T6021276; Fri, 24 Jun 2011 09:03:24 -0400 From: Alon Levy To: qemu-devel@nongnu.org Date: Fri, 24 Jun 2011 15:02:56 +0200 Message-Id: <1308920577-31569-12-git-send-email-alevy@redhat.com> In-Reply-To: <1308920577-31569-1-git-send-email-alevy@redhat.com> References: <1308920577-31569-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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 v2] 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 | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 969a984..fab0208 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1167,6 +1167,30 @@ static void ioport_write(void *opaque, uint32_t addr, uint32_t val) case QXL_IO_DESTROY_ALL_SURFACES: qemu_spice_destroy_surfaces(&d->ssd); break; + case QXL_IO_FLUSH_SURFACES: + dprint(d, 1, "QXL_IO_FLUSH_SURFACES (%d) entry (%s, s#=%d, res#=%d)\n", + val, qxl_mode_to_string(d->mode), d->guest_surfaces.count, + d->num_free_res); + qemu_spice_stop(&d->ssd); + qemu_spice_start(&d->ssd); + dprint(d, 1, "QXL_IO_FLUSH_SURFACES 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_RELEASE: { + QXLReleaseRing *ring = &d->ram->release_ring; + if (ring->prod - ring->cons + 1 == ring->num_items) { + // TODO - "return" a value to the guest and let it loop? + 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_MEMSLOT_ADD_ASYNC: PANIC_ON(val >= NUM_MEMSLOTS); PANIC_ON(d->guest_slots[val].active);