From nobody Tue Nov 4 18:28:44 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530611240760653.2965473992866; Tue, 3 Jul 2018 02:47:20 -0700 (PDT) Received: from localhost ([::1]:39226 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faHty-0002uk-P6 for importer@patchew.org; Tue, 03 Jul 2018 05:47:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36912) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faHs8-0001kZ-RS for qemu-devel@nongnu.org; Tue, 03 Jul 2018 05:45:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faHs7-000536-No for qemu-devel@nongnu.org; Tue, 03 Jul 2018 05:45:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44576) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1faHs7-00051U-EX for qemu-devel@nongnu.org; Tue, 03 Jul 2018 05:45:19 -0400 Received: from smtp.corp.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A7DF73082149 for ; Tue, 3 Jul 2018 09:45:18 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-220.phx2.redhat.com [10.3.116.220]) by smtp.corp.redhat.com (Postfix) with ESMTP id 061AF8C9B1; Tue, 3 Jul 2018 09:45:11 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id E905A17538; Tue, 3 Jul 2018 11:45:08 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 3 Jul 2018 11:45:05 +0200 Message-Id: <20180703094508.25987-2-kraxel@redhat.com> In-Reply-To: <20180703094508.25987-1-kraxel@redhat.com> References: <20180703094508.25987-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Tue, 03 Jul 2018 09:45:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/4] virtio-gpu: tweak scanout disable. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" - 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 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-id: 20180702162443.16796-2-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 +=3D res->hostmem; } =20 +static void virtio_gpu_disable_scanout(VirtIOGPU *g, int scanout_id) +{ + struct virtio_gpu_scanout *scanout =3D &g->scanout[scanout_id]; + struct virtio_gpu_simple_resource *res; + DisplaySurface *ds =3D NULL; + + if (scanout->resource_id =3D=3D 0) { + return; + } + + res =3D virtio_gpu_find_resource(g, scanout->resource_id); + if (res) { + res->scanout_bitmask &=3D ~(1 << scanout_id); + } + + if (scanout_id =3D=3D 0) { + /* primary head */ + ds =3D qemu_create_message_surface(scanout->width ?: 640, + scanout->height ?: 480, + "Guest disabled display."); + } + dpy_gfx_replace_surface(scanout->con, ds); + scanout->resource_id =3D 0; + scanout->ds =3D NULL; + scanout->width =3D 0; + scanout->height =3D 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, =20 g->enable =3D 1; if (ss.resource_id =3D=3D 0) { - scanout =3D &g->scanout[ss.scanout_id]; - if (scanout->resource_id) { - res =3D virtio_gpu_find_resource(g, scanout->resource_id); - if (res) { - res->scanout_bitmask &=3D ~(1 << ss.scanout_id); - } - } - if (ss.scanout_id =3D=3D 0) { - qemu_log_mask(LOG_GUEST_ERROR, - "%s: illegal scanout id specified %d", - __func__, ss.scanout_id); - cmd->error =3D VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID; - return; - } - dpy_gfx_replace_surface(g->scanout[ss.scanout_id].con, NULL); - scanout->ds =3D NULL; - scanout->width =3D 0; - scanout->height =3D 0; + virtio_gpu_disable_scanout(g, ss.scanout_id); return; } =20 --=20 2.9.3