From: "Marc-André Lureau" <marcandre.lureau@gmail.com>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 2/2] spice/gl: render DisplaySurface via opengl
Date: Fri, 23 Sep 2016 09:26:28 +0000 [thread overview]
Message-ID: <CAJ+F1C+tQ3mqVq0r_uiD9fqzFGGw4SU2OmxGN+Yz-_V62_GTJg@mail.gmail.com> (raw)
In-Reply-To: <1474617028-3979-3-git-send-email-kraxel@redhat.com>
Hi
On Fri, Sep 23, 2016 at 1:09 PM Gerd Hoffmann <kraxel@redhat.com> wrote:
> This switches over spice (in opengl mode) to render DisplaySurface
> updates into a opengl texture, using the helper functions in
> ui/console-gl.c. With this patch applied spice (with gl=on) will
> stop using qxl rendering ops, it will use dma-buf passing all the
> time, i.e. for bios/bootloader (before virtio-gpu driver is loaded)
> too.
>
> This should improve performance even using spice (with gl=on) with
> non-accelerated stdvga because we stop squeezing all display updates
> through a unix/tcp socket and basically using a shared memory transport
> instead.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>
I have been using it for a while too,
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
> include/ui/spice-display.h | 5 ++-
> ui/spice-display.c | 92
> ++++++++++++++++++++++++++++++++++++++++++----
> 2 files changed, 88 insertions(+), 9 deletions(-)
>
> diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h
> index 42e0fdf..184d4c3 100644
> --- a/include/ui/spice-display.h
> +++ b/include/ui/spice-display.h
> @@ -119,7 +119,10 @@ struct SimpleSpiceDisplay {
> /* opengl rendering */
> QEMUBH *gl_unblock_bh;
> QEMUTimer *gl_unblock_timer;
> - int dmabuf_fd;
> + ConsoleGLState *gls;
> + int gl_updates;
> + bool have_scanout;
> + bool have_surface;
> #endif
> };
>
> diff --git a/ui/spice-display.c b/ui/spice-display.c
> index 99132b6..5e6f78a 100644
> --- a/ui/spice-display.c
> +++ b/ui/spice-display.c
> @@ -850,6 +850,74 @@ static void qemu_spice_gl_block_timer(void *opaque)
> fprintf(stderr, "WARNING: spice: no gl-draw-done within one
> second\n");
> }
>
> +static void spice_gl_refresh(DisplayChangeListener *dcl)
> +{
> + SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
> + uint64_t cookie;
> +
> + if (!ssd->ds || qemu_console_is_gl_blocked(ssd->dcl.con)) {
> + return;
> + }
> +
> + graphic_hw_update(dcl->con);
> + if (ssd->gl_updates && ssd->have_surface) {
> + qemu_spice_gl_block(ssd, true);
> + cookie = (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_GL_DRAW_DONE,
> 0);
> + spice_qxl_gl_draw_async(&ssd->qxl, 0, 0,
> + surface_width(ssd->ds),
> + surface_height(ssd->ds),
> + cookie);
> + ssd->gl_updates = 0;
> + }
> +}
> +
> +static void spice_gl_update(DisplayChangeListener *dcl,
> + int x, int y, int w, int h)
> +{
> + SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
> +
> + surface_gl_update_texture(ssd->gls, ssd->ds, x, y, w, h);
> + ssd->gl_updates++;
> +}
> +
> +static void spice_gl_switch(DisplayChangeListener *dcl,
> + struct DisplaySurface *new_surface)
> +{
> + SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
> + EGLint stride, fourcc;
> + int fd;
> +
> + if (ssd->ds) {
> + surface_gl_destroy_texture(ssd->gls, ssd->ds);
> + }
> + ssd->ds = new_surface;
> + if (ssd->ds) {
> + surface_gl_create_texture(ssd->gls, ssd->ds);
> + fd = egl_get_fd_for_texture(ssd->ds->texture,
> + &stride, &fourcc);
> + if (fd < 0) {
> + surface_gl_destroy_texture(ssd->gls, ssd->ds);
> + return;
> + }
> +
> + dprint(1, "%s: %dx%d (stride %d/%d, fourcc 0x%x)\n", __func__,
> + surface_width(ssd->ds), surface_height(ssd->ds),
> + surface_stride(ssd->ds), stride, fourcc);
> +
> + /* note: spice server will close the fd */
> + spice_qxl_gl_scanout(&ssd->qxl, fd,
> + surface_width(ssd->ds),
> + surface_height(ssd->ds),
> + stride, fourcc, false);
> + ssd->have_surface = true;
> + ssd->have_scanout = false;
> +
> + qemu_spice_gl_monitor_config(ssd, 0, 0,
> + surface_width(ssd->ds),
> + surface_height(ssd->ds));
> + }
> +}
> +
> static QEMUGLContext qemu_spice_gl_create_context(DisplayChangeListener
> *dcl,
> QEMUGLParams *params)
> {
> @@ -887,6 +955,8 @@ static void
> qemu_spice_gl_scanout(DisplayChangeListener *dcl,
> /* note: spice server will close the fd */
> spice_qxl_gl_scanout(&ssd->qxl, fd, backing_width, backing_height,
> stride, fourcc, y_0_top);
> + ssd->have_surface = false;
> + ssd->have_scanout = (tex_id != 0);
>
> qemu_spice_gl_monitor_config(ssd, x, y, w, h);
> }
> @@ -897,6 +967,10 @@ static void
> qemu_spice_gl_update(DisplayChangeListener *dcl,
> SimpleSpiceDisplay *ssd = container_of(dcl, SimpleSpiceDisplay, dcl);
> uint64_t cookie;
>
> + if (!ssd->have_scanout) {
> + return;
> + }
> +
> dprint(2, "%s: %dx%d+%d+%d\n", __func__, w, h, x, y);
> qemu_spice_gl_block(ssd, true);
> cookie = (uintptr_t)qxl_cookie_new(QXL_COOKIE_TYPE_GL_DRAW_DONE, 0);
> @@ -904,13 +978,13 @@ static void
> qemu_spice_gl_update(DisplayChangeListener *dcl,
> }
>
> static const DisplayChangeListenerOps display_listener_gl_ops = {
> - .dpy_name = "spice-egl",
> - .dpy_gfx_update = display_update,
> - .dpy_gfx_switch = display_switch,
> - .dpy_gfx_check_format = qemu_pixman_check_format,
> - .dpy_refresh = display_refresh,
> - .dpy_mouse_set = display_mouse_set,
> - .dpy_cursor_define = display_mouse_define,
> + .dpy_name = "spice-egl",
> + .dpy_gfx_update = spice_gl_update,
> + .dpy_gfx_switch = spice_gl_switch,
> + .dpy_gfx_check_format = console_gl_check_format,
> + .dpy_refresh = spice_gl_refresh,
> + .dpy_mouse_set = display_mouse_set,
> + .dpy_cursor_define = display_mouse_define,
>
> .dpy_gl_ctx_create = qemu_spice_gl_create_context,
> .dpy_gl_ctx_destroy = qemu_egl_destroy_context,
> @@ -933,10 +1007,12 @@ static void qemu_spice_display_init_one(QemuConsole
> *con)
> #ifdef HAVE_SPICE_GL
> if (display_opengl) {
> ssd->dcl.ops = &display_listener_gl_ops;
> - ssd->dmabuf_fd = -1;
> ssd->gl_unblock_bh = qemu_bh_new(qemu_spice_gl_unblock_bh, ssd);
> ssd->gl_unblock_timer = timer_new_ms(QEMU_CLOCK_REALTIME,
> qemu_spice_gl_block_timer,
> ssd);
> + ssd->gls = console_gl_init_context();
> + ssd->have_surface = false;
> + ssd->have_scanout = false;
> }
> #endif
> ssd->dcl.con = con;
> --
> 1.8.3.1
>
>
> --
Marc-André Lureau
prev parent reply other threads:[~2016-09-23 9:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-23 7:50 [Qemu-devel] [PATCH 0/2] spice/gl: render DisplaySurface via opengl Gerd Hoffmann
2016-09-23 7:50 ` [Qemu-devel] [PATCH 1/2] console: track gl_block state in QemuConsole Gerd Hoffmann
2016-09-23 7:50 ` [Qemu-devel] [PATCH 2/2] spice/gl: render DisplaySurface via opengl Gerd Hoffmann
2016-09-23 9:26 ` Marc-André Lureau [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAJ+F1C+tQ3mqVq0r_uiD9fqzFGGw4SU2OmxGN+Yz-_V62_GTJg@mail.gmail.com \
--to=marcandre.lureau@gmail.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.