Commit da566a18 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

virtio-gpu: tweak scanout disable. 



- Factor out the code to virtio_gpu_disable_scanout().
- Allow disable scanout 0, show a message then.
- Clear scanout->resource_id.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20180702162443.16796-2-kraxel@redhat.com
parent ab08440a

hw/display/virtio-gpu.c

+29 −18
Original line number Diff line number Diff line
@@ -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;

    }