aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2018-07-02 18:24:42 +0200
committerGerd Hoffmann <kraxel@redhat.com>2018-07-03 11:19:39 +0200
commitc806cfa036a7ec991170eb9899f3a676bfcc3253 (patch)
tree6cb9c213102ce0ea261eb9f27988a39f66747074 /hw
parentda566a18a7799e5a655cd9f87e222b672cc93e7b (diff)
downloadqemu-c806cfa036a7ec991170eb9899f3a676bfcc3253.zip
qemu-c806cfa036a7ec991170eb9899f3a676bfcc3253.tar.gz
qemu-c806cfa036a7ec991170eb9899f3a676bfcc3253.tar.bz2
virtio-gpu: update old resource too.
When switching scanout from one resource to another we must update the scanout_bitmask field for both new (set bit) and old (clear bit) resource. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-id: 20180702162443.16796-3-kraxel@redhat.com
Diffstat (limited to 'hw')
-rw-r--r--hw/display/virtio-gpu.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 054ec73..336dc59 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -590,7 +590,7 @@ static void virtio_unref_resource(pixman_image_t *image, void *data)
static void virtio_gpu_set_scanout(VirtIOGPU *g,
struct virtio_gpu_ctrl_command *cmd)
{
- struct virtio_gpu_simple_resource *res;
+ struct virtio_gpu_simple_resource *res, *ores;
struct virtio_gpu_scanout *scanout;
pixman_format_code_t format;
uint32_t offset;
@@ -664,6 +664,11 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g,
dpy_gfx_replace_surface(g->scanout[ss.scanout_id].con, scanout->ds);
}
+ ores = virtio_gpu_find_resource(g, scanout->resource_id);
+ if (ores) {
+ ores->scanout_bitmask &= ~(1 << ss.scanout_id);
+ }
+
res->scanout_bitmask |= (1 << ss.scanout_id);
scanout->resource_id = ss.resource_id;
scanout->x = ss.r.x;