From nobody Fri Oct 24 22:13:27 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519732005062275.484314123938; Tue, 27 Feb 2018 03:46:45 -0800 (PST) Received: from localhost ([::1]:36381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqdiU-0003EA-Ni for importer@patchew.org; Tue, 27 Feb 2018 06:46:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eqdc7-00068N-4L for qemu-devel@nongnu.org; Tue, 27 Feb 2018 06:40:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eqdc0-0001fX-NC for qemu-devel@nongnu.org; Tue, 27 Feb 2018 06:40:07 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41918 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eqdc0-0001eY-HY for qemu-devel@nongnu.org; Tue, 27 Feb 2018 06:40:00 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 20B63EB704 for ; Tue, 27 Feb 2018 11:40:00 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-147.ams2.redhat.com [10.36.116.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2066510B0F32; Tue, 27 Feb 2018 11:39:58 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 98AA917536; Tue, 27 Feb 2018 12:39:57 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 27 Feb 2018 12:39:57 +0100 Message-Id: <20180227113957.17461-4-kraxel@redhat.com> In-Reply-To: <20180227113957.17461-1-kraxel@redhat.com> References: <20180227113957.17461-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 27 Feb 2018 11:40:00 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 27 Feb 2018 11:40:00 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 3/3] spice: add cursor_dmabuf support 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Add support for cursor dmabufs. qemu has to render the cursor for that, so in case a cursor is present qemu allocates a new dmabuf, blits the scanout, blends in the pointer and passes on the new dmabuf to spice-server. Without cursor qemu continues to simply pass on the scanout dmabuf as-is. Signed-off-by: Gerd Hoffmann --- include/ui/spice-display.h | 9 ++++ ui/spice-display.c | 112 +++++++++++++++++++++++++++++++++++++++++= ++-- ui/trace-events | 3 ++ 3 files changed, 119 insertions(+), 5 deletions(-) diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 6b5c73b21c..87a84a59d4 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -122,6 +122,15 @@ struct SimpleSpiceDisplay { int gl_updates; bool have_scanout; bool have_surface; + + QemuDmaBuf *guest_dmabuf; + bool guest_dmabuf_refresh; + bool render_cursor; + + egl_fb guest_fb; + egl_fb blit_fb; + egl_fb cursor_fb; + bool have_hot; #endif }; =20 diff --git a/ui/spice-display.c b/ui/spice-display.c index a494db1196..a1cb23e99d 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -941,25 +941,124 @@ static void qemu_spice_gl_scanout_dmabuf(DisplayChan= geListener *dcl, { SimpleSpiceDisplay *ssd =3D container_of(dcl, SimpleSpiceDisplay, dcl); =20 - /* note: spice server will close the fd, so hand over a dup */ - spice_qxl_gl_scanout(&ssd->qxl, dup(dmabuf->fd), - dmabuf->width, dmabuf->height, - dmabuf->stride, dmabuf->fourcc, false); - qemu_spice_gl_monitor_config(ssd, 0, 0, dmabuf->width, dmabuf->height); + ssd->guest_dmabuf =3D dmabuf; + ssd->guest_dmabuf_refresh =3D true; + ssd->have_surface =3D false; ssd->have_scanout =3D true; } =20 +static void qemu_spice_gl_cursor_dmabuf(DisplayChangeListener *dcl, + QemuDmaBuf *dmabuf, bool have_hot, + uint32_t hot_x, uint32_t hot_y) +{ + SimpleSpiceDisplay *ssd =3D container_of(dcl, SimpleSpiceDisplay, dcl); + + ssd->have_hot =3D have_hot; + ssd->hot_x =3D hot_x; + ssd->hot_y =3D hot_y; + + trace_qemu_spice_gl_cursor(ssd->qxl.id, dmabuf !=3D NULL, have_hot); + if (dmabuf) { + egl_dmabuf_import_texture(dmabuf); + if (!dmabuf->texture) { + return; + } + egl_fb_setup_for_tex(&ssd->cursor_fb, dmabuf->width, dmabuf->heigh= t, + dmabuf->texture, false); + } else { + egl_fb_destroy(&ssd->cursor_fb); + } +} + +static void qemu_spice_gl_cursor_position(DisplayChangeListener *dcl, + uint32_t pos_x, uint32_t pos_y) +{ + SimpleSpiceDisplay *ssd =3D container_of(dcl, SimpleSpiceDisplay, dcl); + + ssd->ptr_x =3D pos_x; + ssd->ptr_y =3D pos_y; +} + +static void qemu_spice_gl_release_dmabuf(DisplayChangeListener *dcl, + QemuDmaBuf *dmabuf) +{ + SimpleSpiceDisplay *ssd =3D container_of(dcl, SimpleSpiceDisplay, dcl); + + if (ssd->guest_dmabuf =3D=3D dmabuf) { + ssd->guest_dmabuf =3D NULL; + ssd->guest_dmabuf_refresh =3D false; + } + egl_dmabuf_release_texture(dmabuf); +} + static void qemu_spice_gl_update(DisplayChangeListener *dcl, uint32_t x, uint32_t y, uint32_t w, uint3= 2_t h) { SimpleSpiceDisplay *ssd =3D container_of(dcl, SimpleSpiceDisplay, dcl); + EGLint stride =3D 0, fourcc =3D 0; + bool render_cursor =3D false; + bool y_0_top =3D false; /* FIXME */ uint64_t cookie; + int fd; =20 if (!ssd->have_scanout) { return; } =20 + if (ssd->cursor_fb.texture) { + render_cursor =3D true; + } + if (ssd->render_cursor !=3D render_cursor) { + ssd->render_cursor =3D render_cursor; + ssd->guest_dmabuf_refresh =3D true; + egl_fb_destroy(&ssd->blit_fb); + } + + if (ssd->guest_dmabuf_refresh) { + QemuDmaBuf *dmabuf =3D ssd->guest_dmabuf; + if (render_cursor) { + egl_dmabuf_import_texture(dmabuf); + if (!dmabuf->texture) { + return; + } + + /* source framebuffer */ + egl_fb_setup_for_tex(&ssd->guest_fb, + dmabuf->width, dmabuf->height, + dmabuf->texture, false); + + /* dest framebuffer */ + if (ssd->blit_fb.width !=3D dmabuf->width || + ssd->blit_fb.height !=3D dmabuf->height) { + trace_qemu_spice_gl_render_dmabuf(ssd->qxl.id, + dmabuf->width, dmabuf->h= eight); + egl_fb_destroy(&ssd->blit_fb); + egl_fb_setup_new_tex(&ssd->blit_fb, dmabuf->width, dmabuf-= >height); + fd =3D egl_get_fd_for_texture(ssd->blit_fb.texture, &strid= e, &fourcc); + spice_qxl_gl_scanout(&ssd->qxl, fd, + dmabuf->width, dmabuf->height, + stride, fourcc, false); + } + } else { + trace_qemu_spice_gl_forward_dmabuf(ssd->qxl.id, + dmabuf->width, dmabuf->heig= ht); + /* note: spice server will close the fd, so hand over a dup */ + spice_qxl_gl_scanout(&ssd->qxl, dup(dmabuf->fd), + dmabuf->width, dmabuf->height, + dmabuf->stride, dmabuf->fourcc, false); + } + qemu_spice_gl_monitor_config(ssd, 0, 0, dmabuf->width, dmabuf->hei= ght); + ssd->guest_dmabuf_refresh =3D false; + } + + if (render_cursor) { + egl_texture_blit(ssd->gls, &ssd->blit_fb, &ssd->guest_fb, + !y_0_top); + egl_texture_blend(ssd->gls, &ssd->blit_fb, &ssd->cursor_fb, + !y_0_top, ssd->ptr_x, ssd->ptr_y); + glFlush(); + } =20 trace_qemu_spice_gl_update(ssd->qxl.id, w, h, x, y); qemu_spice_gl_block(ssd, true); @@ -984,6 +1083,9 @@ static const DisplayChangeListenerOps display_listener= _gl_ops =3D { .dpy_gl_scanout_disable =3D qemu_spice_gl_scanout_disable, .dpy_gl_scanout_texture =3D qemu_spice_gl_scanout_texture, .dpy_gl_scanout_dmabuf =3D qemu_spice_gl_scanout_dmabuf, + .dpy_gl_cursor_dmabuf =3D qemu_spice_gl_cursor_dmabuf, + .dpy_gl_cursor_position =3D qemu_spice_gl_cursor_position, + .dpy_gl_release_dmabuf =3D qemu_spice_gl_release_dmabuf, .dpy_gl_update =3D qemu_spice_gl_update, }; =20 diff --git a/ui/trace-events b/ui/trace-events index 518e950a01..a957f363f1 100644 --- a/ui/trace-events +++ b/ui/trace-events @@ -83,6 +83,9 @@ qemu_spice_ui_info(int qid, uint32_t width, uint32_t heig= ht) "%d %dx%d" qemu_spice_gl_surface(int qid, uint32_t w, uint32_t h, uint32_t fourcc) "%= d %dx%d, fourcc 0x%x" qemu_spice_gl_scanout_disable(int qid) "%d" qemu_spice_gl_scanout_texture(int qid, uint32_t w, uint32_t h, uint32_t fo= urcc) "%d %dx%d, fourcc 0x%x" +qemu_spice_gl_cursor(int qid, bool enabled, bool hotspot) "%d enabled %d, = hotspot %d" +qemu_spice_gl_forward_dmabuf(int qid, uint32_t width, uint32_t height) "%d= %dx%d" +qemu_spice_gl_render_dmabuf(int qid, uint32_t width, uint32_t height) "%d = %dx%d" qemu_spice_gl_update(int qid, uint32_t x, uint32_t y, uint32_t w, uint32_t= h) "%d +%d+%d %dx%d" =20 # ui/keymaps.c --=20 2.9.3