* [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes.
@ 2018-07-02 16:24 Gerd Hoffmann
2018-07-02 16:24 ` [Qemu-devel] [PATCH 1/3] virtio-gpu: tweak scanout disable Gerd Hoffmann
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2018-07-02 16:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Michael S. Tsirkin
Gerd Hoffmann (3):
virtio-gpu: tweak scanout disable.
virtio-gpu: update old resource too.
virtio-gpu: disable scanout when backing resource is destroyed
hw/display/virtio-gpu.c | 64 ++++++++++++++++++++++++++++++++++---------------
1 file changed, 45 insertions(+), 19 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 1/3] virtio-gpu: tweak scanout disable.
2018-07-02 16:24 [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes Gerd Hoffmann
@ 2018-07-02 16:24 ` Gerd Hoffmann
2018-07-02 16:24 ` [Qemu-devel] [PATCH 2/3] virtio-gpu: update old resource too Gerd Hoffmann
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2018-07-02 16:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Michael S. Tsirkin
- Factor out the code to virtio_gpu_disable_scanout().
- Allow disable scanout 0, show a message then.
- Clear scanout->resource_id.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/virtio-gpu.c | 47 +++++++++++++++++++++++++++++------------------
1 file changed, 29 insertions(+), 18 deletions(-)
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 2dd3c3481a..054ec73c0a 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -399,6 +399,34 @@ static void virtio_gpu_resource_create_2d(VirtIOGPU *g,
g->hostmem += res->hostmem;
}
+static void virtio_gpu_disable_scanout(VirtIOGPU *g, int scanout_id)
+{
+ struct virtio_gpu_scanout *scanout = &g->scanout[scanout_id];
+ struct virtio_gpu_simple_resource *res;
+ DisplaySurface *ds = NULL;
+
+ if (scanout->resource_id == 0) {
+ return;
+ }
+
+ res = virtio_gpu_find_resource(g, scanout->resource_id);
+ if (res) {
+ res->scanout_bitmask &= ~(1 << scanout_id);
+ }
+
+ if (scanout_id == 0) {
+ /* primary head */
+ ds = qemu_create_message_surface(scanout->width ?: 640,
+ scanout->height ?: 480,
+ "Guest disabled display.");
+ }
+ dpy_gfx_replace_surface(scanout->con, ds);
+ scanout->resource_id = 0;
+ scanout->ds = NULL;
+ scanout->width = 0;
+ scanout->height = 0;
+}
+
static void virtio_gpu_resource_destroy(VirtIOGPU *g,
struct virtio_gpu_simple_resource *res)
{
@@ -583,24 +611,7 @@ static void virtio_gpu_set_scanout(VirtIOGPU *g,
g->enable = 1;
if (ss.resource_id == 0) {
- scanout = &g->scanout[ss.scanout_id];
- if (scanout->resource_id) {
- res = virtio_gpu_find_resource(g, scanout->resource_id);
- if (res) {
- res->scanout_bitmask &= ~(1 << ss.scanout_id);
- }
- }
- if (ss.scanout_id == 0) {
- qemu_log_mask(LOG_GUEST_ERROR,
- "%s: illegal scanout id specified %d",
- __func__, ss.scanout_id);
- cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID;
- return;
- }
- dpy_gfx_replace_surface(g->scanout[ss.scanout_id].con, NULL);
- scanout->ds = NULL;
- scanout->width = 0;
- scanout->height = 0;
+ virtio_gpu_disable_scanout(g, ss.scanout_id);
return;
}
--
2.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 2/3] virtio-gpu: update old resource too.
2018-07-02 16:24 [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes Gerd Hoffmann
2018-07-02 16:24 ` [Qemu-devel] [PATCH 1/3] virtio-gpu: tweak scanout disable Gerd Hoffmann
@ 2018-07-02 16:24 ` Gerd Hoffmann
2018-07-02 16:24 ` [Qemu-devel] [PATCH 3/3] virtio-gpu: disable scanout when backing resource is destroyed Gerd Hoffmann
2018-07-02 16:57 ` [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes Marc-André Lureau
3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2018-07-02 16:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Michael S. Tsirkin
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>
---
hw/display/virtio-gpu.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 054ec73c0a..336dc59007 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;
--
2.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Qemu-devel] [PATCH 3/3] virtio-gpu: disable scanout when backing resource is destroyed
2018-07-02 16:24 [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes Gerd Hoffmann
2018-07-02 16:24 ` [Qemu-devel] [PATCH 1/3] virtio-gpu: tweak scanout disable Gerd Hoffmann
2018-07-02 16:24 ` [Qemu-devel] [PATCH 2/3] virtio-gpu: update old resource too Gerd Hoffmann
@ 2018-07-02 16:24 ` Gerd Hoffmann
2018-07-02 16:57 ` [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes Marc-André Lureau
3 siblings, 0 replies; 5+ messages in thread
From: Gerd Hoffmann @ 2018-07-02 16:24 UTC (permalink / raw)
To: qemu-devel; +Cc: Gerd Hoffmann, Michael S. Tsirkin
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/virtio-gpu.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index 336dc59007..08cd567218 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -430,6 +430,16 @@ static void virtio_gpu_disable_scanout(VirtIOGPU *g, int scanout_id)
static void virtio_gpu_resource_destroy(VirtIOGPU *g,
struct virtio_gpu_simple_resource *res)
{
+ int i;
+
+ if (res->scanout_bitmask) {
+ for (i = 0; i < g->conf.max_outputs; i++) {
+ if (res->scanout_bitmask & (1 << i)) {
+ virtio_gpu_disable_scanout(g, i);
+ }
+ }
+ }
+
pixman_image_unref(res->image);
virtio_gpu_cleanup_mapping(res);
QTAILQ_REMOVE(&g->reslist, res, next);
--
2.9.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes.
2018-07-02 16:24 [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes Gerd Hoffmann
` (2 preceding siblings ...)
2018-07-02 16:24 ` [Qemu-devel] [PATCH 3/3] virtio-gpu: disable scanout when backing resource is destroyed Gerd Hoffmann
@ 2018-07-02 16:57 ` Marc-André Lureau
3 siblings, 0 replies; 5+ messages in thread
From: Marc-André Lureau @ 2018-07-02 16:57 UTC (permalink / raw)
To: Gerd Hoffmann; +Cc: QEMU, Michael S. Tsirkin
On Mon, Jul 2, 2018 at 6:24 PM, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
>
> Gerd Hoffmann (3):
> virtio-gpu: tweak scanout disable.
> virtio-gpu: update old resource too.
> virtio-gpu: disable scanout when backing resource is destroyed
>
Series:
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> hw/display/virtio-gpu.c | 64 ++++++++++++++++++++++++++++++++++---------------
> 1 file changed, 45 insertions(+), 19 deletions(-)
>
> --
> 2.9.3
>
>
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-07-02 16:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-02 16:24 [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes Gerd Hoffmann
2018-07-02 16:24 ` [Qemu-devel] [PATCH 1/3] virtio-gpu: tweak scanout disable Gerd Hoffmann
2018-07-02 16:24 ` [Qemu-devel] [PATCH 2/3] virtio-gpu: update old resource too Gerd Hoffmann
2018-07-02 16:24 ` [Qemu-devel] [PATCH 3/3] virtio-gpu: disable scanout when backing resource is destroyed Gerd Hoffmann
2018-07-02 16:57 ` [Qemu-devel] [PATCH 0/3] virtio-gpu: scanout tracking fixes Marc-André Lureau
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.