| From 9730b328cc524281334344466a01fb861b271b82 Mon Sep 17 00:00:00 2001 |
| From: Gerd Hoffmann <kraxel@redhat.com> |
| Date: Wed, 22 Feb 2017 12:36:22 +0100 |
| Subject: [PATCH 04/24] ui/vnc: optimize setting in vnc_dpy_update() |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| RH-Author: Gerd Hoffmann <kraxel@redhat.com> |
| Message-id: <1487766986-6329-5-git-send-email-kraxel@redhat.com> |
| Patchwork-id: 73974 |
| O-Subject: [RHEL-7.4 qemu-kvm PATCH 4/8] ui/vnc: optimize setting in vnc_dpy_update() |
| Bugzilla: 1377977 |
| RH-Acked-by: Thomas Huth <thuth@redhat.com> |
| RH-Acked-by: Marc-André Lureau <mlureau@redhat.com> |
| RH-Acked-by: Laurent Vivier <lvivier@redhat.com> |
| |
| From: Peter Lieven <pl@kamp.de> |
| |
| Signed-off-by: Peter Lieven <pl@kamp.de> |
| Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> |
| Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| (cherry picked from commit 919372251cbfa9e43b0264fec475dd1eca23784f) |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| ui/vnc.c | 16 +++++----------- |
| 1 file changed, 5 insertions(+), 11 deletions(-) |
| |
| diff --git a/ui/vnc.c b/ui/vnc.c |
| index 54530a2..2540261 100644 |
| |
| |
| @@ -430,30 +430,24 @@ static int vnc_refresh_server_surface(VncDisplay *vd); |
| static void vnc_dpy_update(DisplayChangeListener *dcl, |
| int x, int y, int w, int h) |
| { |
| - int i; |
| VncDisplay *vd = container_of(dcl, VncDisplay, dcl); |
| struct VncSurface *s = &vd->guest; |
| int width = surface_width(vd->ds); |
| int height = surface_height(vd->ds); |
| |
| - h += y; |
| - |
| - /* round x down to ensure the loop only spans one 16-pixel block per, |
| - iteration. otherwise, if (x % 16) != 0, the last iteration may span |
| - two 16-pixel blocks but we only mark the first as dirty |
| - */ |
| + /* this is needed this to ensure we updated all affected |
| + * blocks if x % VNC_DIRTY_PIXELS_PER_BIT != 0 */ |
| w += (x % VNC_DIRTY_PIXELS_PER_BIT); |
| x -= (x % VNC_DIRTY_PIXELS_PER_BIT); |
| |
| x = MIN(x, width); |
| y = MIN(y, height); |
| w = MIN(x + w, width) - x; |
| - h = MIN(h, height); |
| + h = MIN(y + h, height); |
| |
| for (; y < h; y++) { |
| - for (i = 0; i < w; i += VNC_DIRTY_PIXELS_PER_BIT) { |
| - set_bit((x + i) / VNC_DIRTY_PIXELS_PER_BIT, s->dirty[y]); |
| - } |
| + bitmap_set(s->dirty[y], x / VNC_DIRTY_PIXELS_PER_BIT, |
| + DIV_ROUND_UP(w, VNC_DIRTY_PIXELS_PER_BIT)); |
| } |
| } |
| |
| -- |
| 1.8.3.1 |
| |