From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPbRn-0006ho-0V for qemu-devel@nongnu.org; Mon, 17 Mar 2014 13:35:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WPbRg-0006ul-Ef for qemu-devel@nongnu.org; Mon, 17 Mar 2014 13:35:34 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:35098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WPbRf-0006ua-Nf for qemu-devel@nongnu.org; Mon, 17 Mar 2014 13:35:27 -0400 Date: Mon, 17 Mar 2014 12:35:19 -0500 From: Serge Hallyn Message-ID: <20140317173519.GA26776@sergelap> References: <20140314160616.GA16438@sergelap> <1395063841.5663.9.camel@nilsson.home.kraxel.org> <53270033.4080100@kamp.de> <20140317141012.GE7725@sergelap> <53270E30.4080400@dlhnet.de> <20140317151933.GA29848@sergelap> <532714C8.9070204@kamp.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <532714C8.9070204@kamp.de> Subject: Re: [Qemu-devel] vnc regression with -vga vmware List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Lieven Cc: Doug Smythies , Peter Lieven , Gerd Hoffmann , qemu-devel@nongnu.org Quoting Peter Lieven (pl@kamp.de): > > On 17.03.2014 16:19, Serge Hallyn wrote: > >Quoting Peter Lieven (lieven-lists@dlhnet.de): > >>I found 2 issues: > >> > >>- with vmware VGA the server surface and the client desktop size are out of sync for some time > >>at a resolution change. the server surface gets updates for x coordinates that are out of bound > >>for the client. > >>- the max width of the client (2360) is not dividable by 16 (VNC_DIRTY_PIXELS_PER_BIT). > >> > >>I will try to fix this in ui/vnc but we should definetly look for the root cause. > >Thanks, Peter! > > > >-serge > > > The vmware vga driver seems to do some nasty things. > I receive the msg like this (independent of ui/vnc): > vmsvga_update_rect: update x was < 0 (-65) > > Can you try the following patch: Indeed, with this patch it seems quite stable, thanks. -serge > diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c > index bd2c108..6ae3348 100644 > --- a/hw/display/vmware_vga.c > +++ b/hw/display/vmware_vga.c > @@ -25,6 +25,7 @@ > #include "hw/loader.h" > #include "trace.h" > #include "ui/console.h" > +#include "ui/vnc.h" > #include "hw/pci/pci.h" > > #undef VERBOSE > @@ -218,7 +219,7 @@ enum { > > /* These values can probably be changed arbitrarily. */ > #define SVGA_SCRATCH_SIZE 0x8000 > -#define SVGA_MAX_WIDTH 2360 > +#define SVGA_MAX_WIDTH ROUND_UP(2360, VNC_DIRTY_PIXELS_PER_BIT) > #define SVGA_MAX_HEIGHT 1770 > > #ifdef VERBOSE > diff --git a/ui/vnc.c b/ui/vnc.c > index 9c84b3e..5925774 100644 > --- a/ui/vnc.c > +++ b/ui/vnc.c > @@ -888,7 +888,7 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync) > VncDisplay *vd = vs->vd; > VncJob *job; > int y; > - int height; > + int height, width; > int n = 0; > > if (vs->output.offset && !vs->audio_cap && !vs->force_update) > @@ -907,6 +907,7 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync) > job = vnc_job_new(vs); > > height = MIN(pixman_image_get_height(vd->server), vs->client_height); > + width = MIN(pixman_image_get_width(vd->server), vs->client_width); > > y = 0; > for (;;) { > @@ -925,8 +926,11 @@ static int vnc_update_client(VncState *vs, int has_dirty, bool sync) > VNC_DIRTY_BPL(vs), x); > bitmap_clear(vs->dirty[y], x, x2 - x); > h = find_and_clear_dirty_height(vs, y, x, x2, height); > - n += vnc_job_add_rect(job, x * VNC_DIRTY_PIXELS_PER_BIT, y, > - (x2 - x) * VNC_DIRTY_PIXELS_PER_BIT, h); > + x2 = MIN(x2, width / VNC_DIRTY_PIXELS_PER_BIT); > + if (x2 > x) { > + n += vnc_job_add_rect(job, x * VNC_DIRTY_PIXELS_PER_BIT, y, > + (x2 - x) * VNC_DIRTY_PIXELS_PER_BIT, h); > + } > } > > vnc_job_push(job); > > Peter > > >