From nobody Fri Dec 19 17:09:43 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639752872123502.1062812644619; Fri, 17 Dec 2021 06:54:32 -0800 (PST) Received: from localhost ([::1]:33116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myEcx-00060c-4U for importer@patchew.org; Fri, 17 Dec 2021 09:54:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myERW-0003Ii-2E for qemu-devel@nongnu.org; Fri, 17 Dec 2021 09:42:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39283) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myERT-0001li-NF for qemu-devel@nongnu.org; Fri, 17 Dec 2021 09:42:41 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-56-drAc2IvIPSSOhBtk-EK9mA-1; Fri, 17 Dec 2021 09:42:37 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 036BC10151E0; Fri, 17 Dec 2021 14:42:37 +0000 (UTC) Received: from localhost (unknown [10.39.208.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 505909324; Fri, 17 Dec 2021 14:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639752159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qMiNkCokrtNT9mUUH6x5x11OrQaJ0Ac5k+jaVR3jnpg=; b=IdT1yOJVWHyf6+mZlcaJbtih+3WwN4OdhP+tWEv2NKE2rHCaK6uuUXHxWddjBPJUsdQBNf +nAPML49v2TC0CjfjpufXUlZpSs6+fnJc5w08sAP9dTwSRUbpG3rTG5veJKDvRbpj8tn85 lrMpW8VOVcdWK9o2nhoVY1o0Zd4cbD0= X-MC-Unique: drAc2IvIPSSOhBtk-EK9mA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PULL 18/36] console: save current scanout details Date: Fri, 17 Dec 2021 18:37:38 +0400 Message-Id: <20211217143756.1831099-19-marcandre.lureau@redhat.com> In-Reply-To: <20211217143756.1831099-1-marcandre.lureau@redhat.com> References: <20211217143756.1831099-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, richard.henderson@linaro.org, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639752873580100001 From: Marc-Andr=C3=A9 Lureau Add a new DisplayScanout structure to save the current scanout details. This allows to attach later UI backends and set the scanout. Introduce displaychangelistener_display_console() helper function to handle the dpy_gfx_switch/gl_scanout() & dpy_gfx_update() calls. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Gerd Hoffmann --- include/ui/console.h | 27 +++++++ ui/console.c | 165 +++++++++++++++++++++++++++++-------------- 2 files changed, 138 insertions(+), 54 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index eefd7e4dc1f4..f590819880b5 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -108,6 +108,17 @@ struct QemuConsoleClass { #define QEMU_ALLOCATED_FLAG 0x01 #define QEMU_PLACEHOLDER_FLAG 0x02 =20 +typedef struct ScanoutTexture { + uint32_t backing_id; + bool backing_y_0_top; + uint32_t backing_width; + uint32_t backing_height; + uint32_t x; + uint32_t y; + uint32_t width; + uint32_t height; +} ScanoutTexture; + typedef struct DisplaySurface { pixman_format_code_t format; pixman_image_t *image; @@ -178,6 +189,22 @@ typedef struct QemuDmaBuf { bool draw_submitted; } QemuDmaBuf; =20 +enum display_scanout { + SCANOUT_NONE, + SCANOUT_SURFACE, + SCANOUT_TEXTURE, + SCANOUT_DMABUF, +}; + +typedef struct DisplayScanout { + enum display_scanout kind; + union { + /* DisplaySurface *surface; is kept in QemuConsole */ + ScanoutTexture texture; + QemuDmaBuf *dmabuf; + }; +} DisplayScanout; + typedef struct DisplayState DisplayState; typedef struct DisplayGLCtx DisplayGLCtx; =20 diff --git a/ui/console.c b/ui/console.c index 78583df92035..40eebb6d2cc2 100644 --- a/ui/console.c +++ b/ui/console.c @@ -77,6 +77,7 @@ struct QemuConsole { console_type_t console_type; DisplayState *ds; DisplaySurface *surface; + DisplayScanout scanout; int dcls; DisplayGLCtx *gl; int gl_block; @@ -146,6 +147,7 @@ static void dpy_refresh(DisplayState *s); static DisplayState *get_alloc_displaystate(void); static void text_console_update_cursor_timer(void); static void text_console_update_cursor(void *opaque); +static bool displaychangelistener_has_dmabuf(DisplayChangeListener *dcl); =20 static void gui_update(void *opaque) { @@ -481,6 +483,8 @@ static void text_console_resize(QemuConsole *s) TextCell *cells, *c, *c1; int w1, x, y, last_width; =20 + assert(s->scanout.kind =3D=3D SCANOUT_SURFACE); + last_width =3D s->width; s->width =3D surface_width(s->surface) / FONT_WIDTH; s->height =3D surface_height(s->surface) / FONT_HEIGHT; @@ -1052,6 +1056,48 @@ static void console_putchar(QemuConsole *s, int ch) } } =20 +static void displaychangelistener_display_console(DisplayChangeListener *d= cl, + QemuConsole *con) +{ + static const char nodev[] =3D + "This VM has no graphic display device."; + static DisplaySurface *dummy; + + if (!con) { + if (!dcl->ops->dpy_gfx_switch) { + return; + } + if (!dummy) { + dummy =3D qemu_create_placeholder_surface(640, 480, nodev); + } + dcl->ops->dpy_gfx_switch(dcl, dummy); + return; + } + + if (con->scanout.kind =3D=3D SCANOUT_DMABUF && + displaychangelistener_has_dmabuf(dcl)) { + dcl->ops->dpy_gl_scanout_dmabuf(dcl, con->scanout.dmabuf); + } else if (con->scanout.kind =3D=3D SCANOUT_TEXTURE && + dcl->ops->dpy_gl_scanout_texture) { + dcl->ops->dpy_gl_scanout_texture(dcl, + con->scanout.texture.backing_id, + con->scanout.texture.backing_y_0_= top, + con->scanout.texture.backing_widt= h, + con->scanout.texture.backing_heig= ht, + con->scanout.texture.x, + con->scanout.texture.y, + con->scanout.texture.width, + con->scanout.texture.height); + } else if (con->scanout.kind =3D=3D SCANOUT_SURFACE && + dcl->ops->dpy_gfx_switch) { + dcl->ops->dpy_gfx_switch(dcl, con->surface); + } + + dcl->ops->dpy_gfx_update(dcl, 0, 0, + qemu_console_get_width(con, 0), + qemu_console_get_height(con, 0)); +} + void console_select(unsigned int index) { DisplayChangeListener *dcl; @@ -1068,13 +1114,7 @@ void console_select(unsigned int index) if (dcl->con !=3D NULL) { continue; } - if (dcl->ops->dpy_gfx_switch) { - dcl->ops->dpy_gfx_switch(dcl, s->surface); - } - } - if (s->surface) { - dpy_gfx_update(s, 0, 0, surface_width(s->surface), - surface_height(s->surface)); + displaychangelistener_display_console(dcl, s); } } if (ds->have_text) { @@ -1480,9 +1520,6 @@ static bool dpy_gl_compatible_with(QemuConsole *con, = DisplayChangeListener *dcl) =20 void register_displaychangelistener(DisplayChangeListener *dcl) { - static const char nodev[] =3D - "This VM has no graphic display device."; - static DisplaySurface *dummy; QemuConsole *con; =20 assert(!dcl->ds); @@ -1507,16 +1544,7 @@ void register_displaychangelistener(DisplayChangeLis= tener *dcl) } else { con =3D active_console; } - if (dcl->ops->dpy_gfx_switch) { - if (con) { - dcl->ops->dpy_gfx_switch(dcl, con->surface); - } else { - if (!dummy) { - dummy =3D qemu_create_placeholder_surface(640, 480, nodev); - } - dcl->ops->dpy_gfx_switch(dcl, dummy); - } - } + displaychangelistener_display_console(dcl, con); text_console_update_cursor(NULL); } =20 @@ -1597,13 +1625,9 @@ void dpy_gfx_update(QemuConsole *con, int x, int y, = int w, int h) { DisplayState *s =3D con->ds; DisplayChangeListener *dcl; - int width =3D w; - int height =3D h; + int width =3D qemu_console_get_width(con, x + w); + int height =3D qemu_console_get_height(con, y + h); =20 - if (con->surface) { - width =3D surface_width(con->surface); - height =3D surface_height(con->surface); - } x =3D MAX(x, 0); y =3D MAX(y, 0); x =3D MIN(x, width); @@ -1626,12 +1650,10 @@ void dpy_gfx_update(QemuConsole *con, int x, int y,= int w, int h) =20 void dpy_gfx_update_full(QemuConsole *con) { - if (!con->surface) { - return; - } - dpy_gfx_update(con, 0, 0, - surface_width(con->surface), - surface_height(con->surface)); + int w =3D qemu_console_get_width(con, 0); + int h =3D qemu_console_get_height(con, 0); + + dpy_gfx_update(con, 0, 0, w, h); } =20 void dpy_gfx_replace_surface(QemuConsole *con, @@ -1658,6 +1680,7 @@ void dpy_gfx_replace_surface(QemuConsole *con, =20 assert(old_surface !=3D surface); =20 + con->scanout.kind =3D SCANOUT_SURFACE; con->surface =3D surface; QLIST_FOREACH(dcl, &s->listeners, next) { if (con !=3D (dcl->con ? dcl->con : active_console)) { @@ -1833,6 +1856,9 @@ void dpy_gl_scanout_disable(QemuConsole *con) DisplayState *s =3D con->ds; DisplayChangeListener *dcl; =20 + if (con->scanout.kind !=3D SCANOUT_SURFACE) { + con->scanout.kind =3D SCANOUT_NONE; + } QLIST_FOREACH(dcl, &s->listeners, next) { dcl->ops->dpy_gl_scanout_disable(dcl); } @@ -1849,6 +1875,11 @@ void dpy_gl_scanout_texture(QemuConsole *con, DisplayState *s =3D con->ds; DisplayChangeListener *dcl; =20 + con->scanout.kind =3D SCANOUT_TEXTURE; + con->scanout.texture =3D (ScanoutTexture) { + backing_id, backing_y_0_top, backing_width, backing_height, + x, y, width, height + }; QLIST_FOREACH(dcl, &s->listeners, next) { dcl->ops->dpy_gl_scanout_texture(dcl, backing_id, backing_y_0_top, @@ -1863,6 +1894,8 @@ void dpy_gl_scanout_dmabuf(QemuConsole *con, DisplayState *s =3D con->ds; DisplayChangeListener *dcl; =20 + con->scanout.kind =3D SCANOUT_DMABUF; + con->scanout.dmabuf =3D dmabuf; QLIST_FOREACH(dcl, &s->listeners, next) { dcl->ops->dpy_gl_scanout_dmabuf(dcl, dmabuf); } @@ -1989,10 +2022,8 @@ QemuConsole *graphic_console_init(DeviceState *dev, = uint32_t head, s =3D qemu_console_lookup_unused(); if (s) { trace_console_gfx_reuse(s->index); - if (s->surface) { - width =3D surface_width(s->surface); - height =3D surface_height(s->surface); - } + width =3D qemu_console_get_width(s, 0); + height =3D qemu_console_get_height(s, 0); } else { trace_console_gfx_new(); s =3D new_console(ds, GRAPHIC_CONSOLE, head); @@ -2021,13 +2052,8 @@ void graphic_console_close(QemuConsole *con) static const char unplugged[] =3D "Guest display has been unplugged"; DisplaySurface *surface; - int width =3D 640; - int height =3D 480; - - if (con->surface) { - width =3D surface_width(con->surface); - height =3D surface_height(con->surface); - } + int width =3D qemu_console_get_width(con, 640); + int height =3D qemu_console_get_height(con, 480); =20 trace_console_gfx_close(con->index); object_property_set_link(OBJECT(con), "device", NULL, &error_abort); @@ -2179,7 +2205,19 @@ int qemu_console_get_width(QemuConsole *con, int fal= lback) if (con =3D=3D NULL) { con =3D active_console; } - return con ? surface_width(con->surface) : fallback; + if (con =3D=3D NULL) { + return fallback; + } + switch (con->scanout.kind) { + case SCANOUT_DMABUF: + return con->scanout.dmabuf->width; + case SCANOUT_TEXTURE: + return con->scanout.texture.width; + case SCANOUT_SURFACE: + return surface_width(con->surface); + default: + return fallback; + } } =20 int qemu_console_get_height(QemuConsole *con, int fallback) @@ -2187,7 +2225,19 @@ int qemu_console_get_height(QemuConsole *con, int fa= llback) if (con =3D=3D NULL) { con =3D active_console; } - return con ? surface_height(con->surface) : fallback; + if (con =3D=3D NULL) { + return fallback; + } + switch (con->scanout.kind) { + case SCANOUT_DMABUF: + return con->scanout.dmabuf->height; + case SCANOUT_TEXTURE: + return con->scanout.texture.height; + case SCANOUT_SURFACE: + return surface_height(con->surface); + default: + return fallback; + } } =20 static void vc_chr_accept_input(Chardev *chr) @@ -2253,12 +2303,13 @@ static void text_console_do_init(Chardev *chr, Disp= layState *ds) s->total_height =3D DEFAULT_BACKSCROLL; s->x =3D 0; s->y =3D 0; - if (!s->surface) { - if (active_console && active_console->surface) { - g_width =3D surface_width(active_console->surface); - g_height =3D surface_height(active_console->surface); + if (s->scanout.kind !=3D SCANOUT_SURFACE) { + if (active_console && active_console->scanout.kind =3D=3D SCANOUT_= SURFACE) { + g_width =3D qemu_console_get_width(active_console, g_width); + g_height =3D qemu_console_get_height(active_console, g_height); } s->surface =3D qemu_create_displaysurface(g_width, g_height); + s->scanout.kind =3D SCANOUT_SURFACE; } =20 s->hw_ops =3D &text_console_ops; @@ -2317,6 +2368,7 @@ static void vc_chr_open(Chardev *chr, s =3D new_console(NULL, TEXT_CONSOLE, 0); } else { s =3D new_console(NULL, TEXT_CONSOLE_FIXED_SIZE, 0); + s->scanout.kind =3D SCANOUT_SURFACE; s->surface =3D qemu_create_displaysurface(width, height); } =20 @@ -2340,13 +2392,13 @@ static void vc_chr_open(Chardev *chr, =20 void qemu_console_resize(QemuConsole *s, int width, int height) { - DisplaySurface *surface; + DisplaySurface *surface =3D qemu_console_surface(s); =20 assert(s->console_type =3D=3D GRAPHIC_CONSOLE); =20 - if (s->surface && (s->surface->flags & QEMU_ALLOCATED_FLAG) && - pixman_image_get_width(s->surface->image) =3D=3D width && - pixman_image_get_height(s->surface->image) =3D=3D height) { + if (surface && (surface->flags & QEMU_ALLOCATED_FLAG) && + pixman_image_get_width(surface->image) =3D=3D width && + pixman_image_get_height(surface->image) =3D=3D height) { return; } =20 @@ -2356,7 +2408,12 @@ void qemu_console_resize(QemuConsole *s, int width, = int height) =20 DisplaySurface *qemu_console_surface(QemuConsole *console) { - return console->surface; + switch (console->scanout.kind) { + case SCANOUT_SURFACE: + return console->surface; + default: + return NULL; + } } =20 PixelFormat qemu_default_pixelformat(int bpp) --=20 2.34.1.8.g35151cf07204