|
 |
1bdc94 |
From 403646c800359dcc52f3bbbf348dda917667d9d1 Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
1bdc94 |
Date: Wed, 4 Jul 2018 09:54:07 +0200
|
|
|
1bdc94 |
Subject: [PATCH 13/89] virtio-gpu: tweak scanout disable.
|
|
|
1bdc94 |
MIME-Version: 1.0
|
|
|
1bdc94 |
Content-Type: text/plain; charset=UTF-8
|
|
|
1bdc94 |
Content-Transfer-Encoding: 8bit
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180704095409.14514-2-kraxel@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81226
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 1/3] virtio-gpu: tweak scanout disable.
|
|
|
1bdc94 |
Bugzilla: 1589634
|
|
|
1bdc94 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
- Factor out the code to virtio_gpu_disable_scanout().
|
|
|
1bdc94 |
- Allow disable scanout 0, show a message then.
|
|
|
1bdc94 |
- Clear scanout->resource_id.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
|
1bdc94 |
Message-id: 20180702162443.16796-2-kraxel@redhat.com
|
|
|
1bdc94 |
(cherry picked from commit da566a18a7799e5a655cd9f87e222b672cc93e7b)
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
hw/display/virtio-gpu.c | 47 +++++++++++++++++++++++++++++------------------
|
|
|
1bdc94 |
1 file changed, 29 insertions(+), 18 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
|
|
|
1bdc94 |
index 2dd3c34..054ec73 100644
|
|
|
1bdc94 |
--- a/hw/display/virtio-gpu.c
|
|
|
1bdc94 |
+++ b/hw/display/virtio-gpu.c
|
|
|
1bdc94 |
@@ -399,6 +399,34 @@ static void virtio_gpu_resource_create_2d(VirtIOGPU *g,
|
|
|
1bdc94 |
g->hostmem += res->hostmem;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
+static void virtio_gpu_disable_scanout(VirtIOGPU *g, int scanout_id)
|
|
|
1bdc94 |
+{
|
|
|
1bdc94 |
+ struct virtio_gpu_scanout *scanout = &g->scanout[scanout_id];
|
|
|
1bdc94 |
+ struct virtio_gpu_simple_resource *res;
|
|
|
1bdc94 |
+ DisplaySurface *ds = NULL;
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+ if (scanout->resource_id == 0) {
|
|
|
1bdc94 |
+ return;
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+ res = virtio_gpu_find_resource(g, scanout->resource_id);
|
|
|
1bdc94 |
+ if (res) {
|
|
|
1bdc94 |
+ res->scanout_bitmask &= ~(1 << scanout_id);
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
+ if (scanout_id == 0) {
|
|
|
1bdc94 |
+ /* primary head */
|
|
|
1bdc94 |
+ ds = qemu_create_message_surface(scanout->width ?: 640,
|
|
|
1bdc94 |
+ scanout->height ?: 480,
|
|
|
1bdc94 |
+ "Guest disabled display.");
|
|
|
1bdc94 |
+ }
|
|
|
1bdc94 |
+ dpy_gfx_replace_surface(scanout->con, ds);
|
|
|
1bdc94 |
+ scanout->resource_id = 0;
|
|
|
1bdc94 |
+ scanout->ds = NULL;
|
|
|
1bdc94 |
+ scanout->width = 0;
|
|
|
1bdc94 |
+ scanout->height = 0;
|
|
|
1bdc94 |
+}
|
|
|
1bdc94 |
+
|
|
|
1bdc94 |
static void virtio_gpu_resource_destroy(VirtIOGPU *g,
|
|
|
1bdc94 |
struct virtio_gpu_simple_resource *res)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
@@ -583,24 +611,7 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g,
|
|
|
1bdc94 |
|
|
|
1bdc94 |
g->enable = 1;
|
|
|
1bdc94 |
if (ss.resource_id == 0) {
|
|
|
1bdc94 |
- scanout = &g->scanout[ss.scanout_id];
|
|
|
1bdc94 |
- if (scanout->resource_id) {
|
|
|
1bdc94 |
- res = virtio_gpu_find_resource(g, scanout->resource_id);
|
|
|
1bdc94 |
- if (res) {
|
|
|
1bdc94 |
- res->scanout_bitmask &= ~(1 << ss.scanout_id);
|
|
|
1bdc94 |
- }
|
|
|
1bdc94 |
- }
|
|
|
1bdc94 |
- if (ss.scanout_id == 0) {
|
|
|
1bdc94 |
- qemu_log_mask(LOG_GUEST_ERROR,
|
|
|
1bdc94 |
- "%s: illegal scanout id specified %d",
|
|
|
1bdc94 |
- __func__, ss.scanout_id);
|
|
|
1bdc94 |
- cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID;
|
|
|
1bdc94 |
- return;
|
|
|
1bdc94 |
- }
|
|
|
1bdc94 |
- dpy_gfx_replace_surface(g->scanout[ss.scanout_id].con, NULL);
|
|
|
1bdc94 |
- scanout->ds = NULL;
|
|
|
1bdc94 |
- scanout->width = 0;
|
|
|
1bdc94 |
- scanout->height = 0;
|
|
|
1bdc94 |
+ virtio_gpu_disable_scanout(g, ss.scanout_id);
|
|
|
1bdc94 |
return;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|