yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From 6da14e1532783c95c18db157cd8f9b7dada31220 Mon Sep 17 00:00:00 2001
26ba25
From: Gerd Hoffmann <kraxel@redhat.com>
26ba25
Date: Wed, 4 Jul 2018 09:54:08 +0200
26ba25
Subject: [PATCH 188/268] virtio-gpu: update old resource too.
26ba25
MIME-Version: 1.0
26ba25
Content-Type: text/plain; charset=UTF-8
26ba25
Content-Transfer-Encoding: 8bit
26ba25
26ba25
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
26ba25
Message-id: <20180704095409.14514-3-kraxel@redhat.com>
26ba25
Patchwork-id: 81227
26ba25
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 2/3] virtio-gpu: update old resource too.
26ba25
Bugzilla: 1589634
26ba25
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
26ba25
RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
26ba25
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
26ba25
26ba25
When switching scanout from one resource to another we must update the
26ba25
scanout_bitmask field for both new (set bit) and old (clear bit)
26ba25
resource.
26ba25
26ba25
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
26ba25
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
26ba25
Message-id: 20180702162443.16796-3-kraxel@redhat.com
26ba25
(cherry picked from commit c806cfa036a7ec991170eb9899f3a676bfcc3253)
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 hw/display/virtio-gpu.c | 7 ++++++-
26ba25
 1 file changed, 6 insertions(+), 1 deletion(-)
26ba25
26ba25
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
26ba25
index 054ec73..336dc59 100644
26ba25
--- a/hw/display/virtio-gpu.c
26ba25
+++ b/hw/display/virtio-gpu.c
26ba25
@@ -590,7 +590,7 @@ static void virtio_unref_resource(pixman_image_t *image, void *data)
26ba25
 static void virtio_gpu_set_scanout(VirtIOGPU *g,
26ba25
                                    struct virtio_gpu_ctrl_command *cmd)
26ba25
 {
26ba25
-    struct virtio_gpu_simple_resource *res;
26ba25
+    struct virtio_gpu_simple_resource *res, *ores;
26ba25
     struct virtio_gpu_scanout *scanout;
26ba25
     pixman_format_code_t format;
26ba25
     uint32_t offset;
26ba25
@@ -664,6 +664,11 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g,
26ba25
         dpy_gfx_replace_surface(g->scanout[ss.scanout_id].con, scanout->ds);
26ba25
     }
26ba25
 
26ba25
+    ores = virtio_gpu_find_resource(g, scanout->resource_id);
26ba25
+    if (ores) {
26ba25
+        ores->scanout_bitmask &= ~(1 << ss.scanout_id);
26ba25
+    }
26ba25
+
26ba25
     res->scanout_bitmask |= (1 << ss.scanout_id);
26ba25
     scanout->resource_id = ss.resource_id;
26ba25
     scanout->x = ss.r.x;
26ba25
-- 
26ba25
1.8.3.1
26ba25