From patchwork Thu Aug 23 00:10:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: BALATON Zoltan X-Patchwork-Id: 179451 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 971B12C007C for ; Thu, 23 Aug 2012 10:10:59 +1000 (EST) Received: from localhost ([::1]:58690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4L0j-0005Iw-KX for incoming@patchwork.ozlabs.org; Wed, 22 Aug 2012 20:10:57 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4L0b-0005Ig-QF for qemu-devel@nongnu.org; Wed, 22 Aug 2012 20:10:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T4L0a-0008Px-Gw for qemu-devel@nongnu.org; Wed, 22 Aug 2012 20:10:49 -0400 Received: from mono.eik.bme.hu ([152.66.115.2]:64398) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4L0a-0008Pt-0b for qemu-devel@nongnu.org; Wed, 22 Aug 2012 20:10:48 -0400 Received: from localhost (localhost [127.0.0.1]) by mono.eik.bme.hu (Postfix) with ESMTP id 9609E27E for ; Thu, 23 Aug 2012 02:10:47 +0200 (CEST) X-Virus-Scanned: amavisd-new at eik.bme.hu Received: from mono.eik.bme.hu ([127.0.0.1]) by localhost (mono.eik.bme.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id YuAKR1myXNE2 for ; Thu, 23 Aug 2012 02:10:47 +0200 (CEST) Received: by mono.eik.bme.hu (Postfix, from userid 432) id 59A25A61; Thu, 23 Aug 2012 02:10:47 +0200 (CEST) Date: Thu, 23 Aug 2012 02:10:47 +0200 (CEST) From: BALATON Zoltan X-X-Sender: balaton@mono To: qemu-devel@nongnu.org Message-ID: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 152.66.115.2 Subject: [Qemu-devel] [PATCH 3/3] vmware_vga: Allow simple drivers to work without using the fifo 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 Postpone stopping the dirty log to the point where the command fifo is configured to allow drivers which don't use the fifo to work too. (Without this the picture rendered into the vram never got to the screen and the DIRECT_VRAM option meant to support this case was removed a year ago.) Signed-off-by: BALATON Zoltan --- hw/vga.c | 2 +- hw/vga_int.h | 1 + hw/vmware_vga.c | 34 +++++++++++++++++++++++++--------- 3 files changed, 27 insertions(+), 10 deletions(-) Split up version of previous [PATCH] vmware_vga: Cleanup and allow simple drivers to work without the fifo diff --git a/hw/vga.c b/hw/vga.c index f82ced8..7e6dc41 100644 --- a/hw/vga.c +++ b/hw/vga.c @@ -1611,7 +1611,7 @@ void vga_invalidate_scanlines(VGACommonState *s, int y1, int y2) } } -static void vga_sync_dirty_bitmap(VGACommonState *s) +void vga_sync_dirty_bitmap(VGACommonState *s) { memory_region_sync_dirty_bitmap(&s->vram); } diff --git a/hw/vga_int.h b/hw/vga_int.h index 8938093..16d53ef 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -195,6 +195,7 @@ MemoryRegion *vga_init_io(VGACommonState *s, const MemoryRegionPortio **vbe_ports); void vga_common_reset(VGACommonState *s); +void vga_sync_dirty_bitmap(VGACommonState *s); void vga_dirty_log_start(VGACommonState *s); void vga_dirty_log_stop(VGACommonState *s); diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 3c4beb9..2b77766 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -820,11 +820,10 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) break; case SVGA_REG_ENABLE: - s->enable = value; - s->config &= !!value; + s->enable = !!value; s->invalidated = 1; s->vga.invalidate(&s->vga); - if (s->enable) { + if (s->enable && s->config) { vga_dirty_log_stop(&s->vga); } else { vga_dirty_log_start(&s->vga); @@ -860,15 +859,19 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) if (value) { s->fifo = (uint32_t *) s->fifo_ptr; /* Check range and alignment. */ - if ((CMD(min) | CMD(max) | - CMD(next_cmd) | CMD(stop)) & 3) + if ((CMD(min) | CMD(max) | CMD(next_cmd) | CMD(stop)) & 3) { break; - if (CMD(min) < (uint8_t *) s->cmd->fifo - (uint8_t *) s->fifo) + } + if (CMD(min) < (uint8_t *) s->cmd->fifo - (uint8_t *) s->fifo) { break; - if (CMD(max) > SVGA_FIFO_SIZE) + } + if (CMD(max) > SVGA_FIFO_SIZE) { break; - if (CMD(max) < CMD(min) + 10 * 1024) + } + if (CMD(max) < CMD(min) + 10 * 1024) { break; + } + vga_dirty_log_stop(&s->vga); } s->config = !!value; break; @@ -949,6 +952,8 @@ static inline void vmsvga_check_size(struct vmsvga_state_s *s) static void vmsvga_update_display(void *opaque) { struct vmsvga_state_s *s = opaque; + bool dirty = false; + if (!s->enable) { s->vga.update(&s->vga); return; @@ -963,13 +968,24 @@ static void vmsvga_update_display(void *opaque) * Is it more efficient to look at vram VGA-dirty bits or wait * for the driver to issue SVGA_CMD_UPDATE? */ - if (s->invalidated) { + if (memory_region_is_logging(&s->vga.vram)) { + vga_sync_dirty_bitmap(&s->vga); + dirty = memory_region_get_dirty(&s->vga.vram, 0, + ds_get_linesize(s->vga.ds) * ds_get_height(s->vga.ds), + DIRTY_MEMORY_VGA); + } + if (s->invalidated || dirty) { s->invalidated = 0; memcpy(ds_get_data(s->vga.ds), s->vga.vram_ptr, ds_get_linesize(s->vga.ds) * ds_get_height(s->vga.ds)); dpy_update(s->vga.ds, 0, 0, ds_get_width(s->vga.ds), ds_get_height(s->vga.ds)); } + if (dirty) { + memory_region_reset_dirty(&s->vga.vram, 0, + ds_get_linesize(s->vga.ds) * ds_get_height(s->vga.ds), + DIRTY_MEMORY_VGA); + } } static void vmsvga_reset(DeviceState *dev)