From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
To: "Akihiko Odaki" <odaki@rsg.ci.i.u-tokyo.ac.jp>,
"Huang Rui" <ray.huang@amd.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Pierre-Eric Pelloux-Prayer" <pierre-eric.pelloux-prayer@amd.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Yiwei Zhang" <zzyiwei@gmail.com>,
"Sergio Lopez Pascual" <slp@redhat.com>
Cc: "Gert Wollny" <gert.wollny@collabora.com>,
qemu-devel@nongnu.org,
"Gurchetan Singh" <gurchetansingh@chromium.org>,
"Alyssa Ross" <hi@alyssa.is>,
"Roger Pau Monné" <roger.pau@citrix.com>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Stefano Stabellini" <stefano.stabellini@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Xenia Ragiadakou" <xenia.ragiadakou@amd.com>,
"Honglei Huang" <honglei1.huang@amd.com>,
"Julia Zhang" <julia.zhang@amd.com>,
"Chen Jiqian" <Jiqian.Chen@amd.com>,
"Rob Clark" <robdclark@gmail.com>,
"Robert Beckett" <bob.beckett@collabora.com>
Subject: [PATCH v20 06/21] ui/sdl2: Implement dpy dmabuf functions
Date: Sun, 1 Mar 2026 23:48:23 +0300 [thread overview]
Message-ID: <20260301204838.596994-7-dmitry.osipenko@collabora.com> (raw)
In-Reply-To: <20260301204838.596994-1-dmitry.osipenko@collabora.com>
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
If EGL is used, we can rely on dmabuf to import textures without
doing copies.
To get this working on X11, we use the existing SDL hint:
SDL_HINT_VIDEO_X11_FORCE_EGL (because dmabuf can't be used with GLX).
Reviewed-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Yiwei Zhang <zzyiwei@gmail.com>
Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
---
include/ui/sdl2.h | 7 +++++
meson.build | 6 ++---
ui/sdl2-gl.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++
ui/sdl2.c | 42 ++++++++++++++++++++++++++++++
4 files changed, 117 insertions(+), 4 deletions(-)
diff --git a/include/ui/sdl2.h b/include/ui/sdl2.h
index dbe6e3d9739b..9daf5ecffae7 100644
--- a/include/ui/sdl2.h
+++ b/include/ui/sdl2.h
@@ -45,6 +45,7 @@ struct sdl2_console {
bool gui_keysym;
SDL_GLContext winctx;
QKbdState *kbd;
+ bool has_dmabuf;
#ifdef CONFIG_OPENGL
QemuGLShader *gls;
egl_fb guest_fb;
@@ -96,5 +97,11 @@ void sdl2_gl_scanout_texture(DisplayChangeListener *dcl,
void *d3d_tex2d);
void sdl2_gl_scanout_flush(DisplayChangeListener *dcl,
uint32_t x, uint32_t y, uint32_t w, uint32_t h);
+void sdl2_gl_scanout_dmabuf(DisplayChangeListener *dcl,
+ QemuDmaBuf *dmabuf);
+void sdl2_gl_release_dmabuf(DisplayChangeListener *dcl,
+ QemuDmaBuf *dmabuf);
+bool sdl2_gl_has_dmabuf(DisplayChangeListener *dcl);
+void sdl2_gl_console_init(struct sdl2_console *scon);
#endif /* SDL2_H */
diff --git a/meson.build b/meson.build
index 3cd1d8dbc669..0ce84d45e6f3 100644
--- a/meson.build
+++ b/meson.build
@@ -1937,10 +1937,8 @@ if get_option('gtk') \
endif
endif
-x11 = not_found
-if gtkx11.found()
- x11 = dependency('x11', method: 'pkg-config', required: gtkx11.found())
-endif
+x11 = dependency('x11', method: 'pkg-config', required: gtkx11.found())
+
png = not_found
if get_option('png').allowed() and have_system
png = dependency('libpng', version: '>=1.6.34', required: get_option('png'),
diff --git a/ui/sdl2-gl.c b/ui/sdl2-gl.c
index fbac3edbc09d..697ba2169c34 100644
--- a/ui/sdl2-gl.c
+++ b/ui/sdl2-gl.c
@@ -26,6 +26,8 @@
*/
#include "qemu/osdep.h"
+#include "qemu/main-loop.h"
+#include "qemu/error-report.h"
#include "ui/console.h"
#include "ui/input.h"
#include "ui/sdl2.h"
@@ -250,3 +252,67 @@ void sdl2_gl_scanout_flush(DisplayChangeListener *dcl,
SDL_GL_SwapWindow(scon->real_window);
}
+
+void sdl2_gl_scanout_dmabuf(DisplayChangeListener *dcl,
+ QemuDmaBuf *dmabuf)
+{
+ struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);
+ const int *fds;
+
+ assert(scon->opengl);
+ SDL_GL_MakeCurrent(scon->real_window, scon->winctx);
+
+ egl_dmabuf_import_texture(dmabuf);
+ if (!qemu_dmabuf_get_texture(dmabuf)) {
+ fds = qemu_dmabuf_get_fds(dmabuf, NULL);
+ error_report("%s: failed fd=%d", __func__, fds ? fds[0] : -1);
+ return;
+ }
+
+ sdl2_gl_scanout_texture(dcl, qemu_dmabuf_get_texture(dmabuf), false,
+ qemu_dmabuf_get_width(dmabuf),
+ qemu_dmabuf_get_height(dmabuf),
+ 0, 0,
+ qemu_dmabuf_get_width(dmabuf),
+ qemu_dmabuf_get_height(dmabuf),
+ NULL);
+
+ if (qemu_dmabuf_get_allow_fences(dmabuf)) {
+ scon->guest_fb.dmabuf = dmabuf;
+ }
+}
+
+void sdl2_gl_release_dmabuf(DisplayChangeListener *dcl,
+ QemuDmaBuf *dmabuf)
+{
+ egl_dmabuf_release_texture(dmabuf);
+}
+
+bool sdl2_gl_has_dmabuf(DisplayChangeListener *dcl)
+{
+ struct sdl2_console *scon = container_of(dcl, struct sdl2_console, dcl);
+
+ return scon->has_dmabuf;
+}
+
+void sdl2_gl_console_init(struct sdl2_console *scon)
+{
+ bool hidden = scon->hidden;
+
+ scon->hidden = true;
+ scon->surface = qemu_create_displaysurface(1, 1);
+ sdl2_window_create(scon);
+
+ /*
+ * QEMU checks whether console supports dma-buf before switching
+ * to the console. To break this chicken-egg problem we pre-check
+ * dma-buf availability beforehand using a dummy SDL window.
+ */
+ scon->has_dmabuf = qemu_egl_has_dmabuf();
+
+ sdl2_window_destroy(scon);
+ qemu_free_displaysurface(scon->surface);
+
+ scon->surface = NULL;
+ scon->hidden = hidden;
+}
diff --git a/ui/sdl2.c b/ui/sdl2.c
index 032dc14bc398..3bb2676f847b 100644
--- a/ui/sdl2.c
+++ b/ui/sdl2.c
@@ -35,6 +35,10 @@
#include "qemu/log.h"
#include "qemu-main.h"
+#ifdef CONFIG_X11
+#include <X11/Xlib.h>
+#endif
+
static int sdl2_num_outputs;
static struct sdl2_console *sdl2_console;
@@ -120,6 +124,9 @@ void sdl2_window_create(struct sdl2_console *scon)
/* The SDL renderer is only used by sdl2-2D, when OpenGL is disabled */
scon->real_renderer = SDL_CreateRenderer(scon->real_window, -1, 0);
}
+
+ qemu_egl_display = eglGetCurrentDisplay();
+
sdl_update_caption(scon);
}
@@ -808,6 +815,10 @@ static const DisplayChangeListenerOps dcl_gl_ops = {
.dpy_gl_scanout_disable = sdl2_gl_scanout_disable,
.dpy_gl_scanout_texture = sdl2_gl_scanout_texture,
.dpy_gl_update = sdl2_gl_scanout_flush,
+
+ .dpy_gl_scanout_dmabuf = sdl2_gl_scanout_dmabuf,
+ .dpy_gl_release_dmabuf = sdl2_gl_release_dmabuf,
+ .dpy_has_dmabuf = sdl2_gl_has_dmabuf,
};
static bool
@@ -835,6 +846,35 @@ static void sdl2_display_early_init(DisplayOptions *o)
}
}
+static void sdl2_set_hint_x11_force_egl(void)
+{
+#if defined(SDL_HINT_VIDEO_X11_FORCE_EGL) && defined(CONFIG_OPENGL) && \
+ defined(CONFIG_X11)
+ Display *x_disp = XOpenDisplay(NULL);
+ EGLDisplay egl_display;
+
+ if (!x_disp) {
+ return;
+ }
+
+ /* Prefer EGL over GLX to get dma-buf support. */
+ egl_display = eglGetDisplay((EGLNativeDisplayType)x_disp);
+
+ if (egl_display != EGL_NO_DISPLAY) {
+ /*
+ * Setting X11_FORCE_EGL hint doesn't make SDL to prefer X11 over
+ * Wayland. SDL will use Wayland driver even if XWayland presents.
+ * It's always safe to set the hint even if X11 is not used by SDL.
+ * SDL will work regardless of the hint.
+ */
+ SDL_SetHint(SDL_HINT_VIDEO_X11_FORCE_EGL, "1");
+ eglTerminate(egl_display);
+ }
+
+ XCloseDisplay(x_disp);
+#endif
+}
+
static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
{
uint8_t data = 0;
@@ -862,6 +902,7 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
SDL_SetHint(SDL_HINT_ALLOW_ALT_TAB_WHILE_GRABBED, "0");
#endif
SDL_SetHint(SDL_HINT_WINDOWS_NO_CLOSE_ON_ALT_F4, "1");
+ sdl2_set_hint_x11_force_egl();
SDL_EnableScreenSaver();
memset(&info, 0, sizeof(info));
SDL_VERSION(&info.version);
@@ -908,6 +949,7 @@ static void sdl2_display_init(DisplayState *ds, DisplayOptions *o)
sdl2_console[i].kbd = qkbd_state_init(con);
if (display_opengl) {
qemu_console_set_display_gl_ctx(con, &sdl2_console[i].dgc);
+ sdl2_gl_console_init(&sdl2_console[i]);
}
register_displaychangelistener(&sdl2_console[i].dcl);
--
2.52.0
next prev parent reply other threads:[~2026-03-01 20:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-01 20:48 [PATCH v20 00/21] Support virtio-gpu DRM native context and MAP_FIXED API Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 01/21] ui/gtk: Don't disable scanout when display is refreshed Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 02/21] ui/gtk: Restore original context after new context creation Dmitry Osipenko
2026-03-02 5:58 ` Akihiko Odaki
2026-03-02 12:01 ` Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 03/21] ui/gdk: " Dmitry Osipenko
2026-03-02 6:17 ` Akihiko Odaki
2026-03-01 20:48 ` [PATCH v20 04/21] ui/sdl2: Don't disable scanout when display is refreshed Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 05/21] ui/sdl2: Restore original context after new context creation Dmitry Osipenko
2026-03-01 20:48 ` Dmitry Osipenko [this message]
2026-03-01 20:48 ` [PATCH v20 07/21] ui/egl-headless: " Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 08/21] ui/spice: " Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 09/21] ui/dbus: " Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 10/21] virtio-gpu: Bounce virtio_gpu_ctrl_bh() to main-loop thread Dmitry Osipenko
2026-03-02 5:57 ` Akihiko Odaki
2026-03-02 11:59 ` Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 11/21] virtio-gpu: Handle virgl fence creation errors Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 12/21] virtio-gpu: Support asynchronous fencing Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 13/21] virtio-gpu: Support DRM native context Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 14/21] docs/system: virtio-gpu: Add link to Mesa VirGL doc Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 15/21] docs/system: virtio-gpu: Update Venus link Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 16/21] docs/system: virtio-gpu: Document host/guest requirements Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 17/21] virtio-gpu: Remove superfluous memory_region_set_enabled() Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 18/21] virtio-gpu: Validate hostmem mapping offset Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 19/21] virtio-gpu: Replace finish_unmapping with mapping_state Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 20/21] virtio-gpu: Destroy virgl resources on virtio-gpu reset Dmitry Osipenko
2026-03-01 20:48 ` [PATCH v20 21/21] virtio-gpu: Support mapping hostmem blobs with map_fixed Dmitry Osipenko
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=20260301204838.596994-7-dmitry.osipenko@collabora.com \
--to=dmitry.osipenko@collabora.com \
--cc=Jiqian.Chen@amd.com \
--cc=alex.bennee@linaro.org \
--cc=alexander.deucher@amd.com \
--cc=bob.beckett@collabora.com \
--cc=christian.koenig@amd.com \
--cc=gert.wollny@collabora.com \
--cc=gurchetansingh@chromium.org \
--cc=hi@alyssa.is \
--cc=honglei1.huang@amd.com \
--cc=julia.zhang@amd.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mst@redhat.com \
--cc=odaki@rsg.ci.i.u-tokyo.ac.jp \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=pierre-eric.pelloux-prayer@amd.com \
--cc=qemu-devel@nongnu.org \
--cc=ray.huang@amd.com \
--cc=robdclark@gmail.com \
--cc=roger.pau@citrix.com \
--cc=slp@redhat.com \
--cc=stefano.stabellini@amd.com \
--cc=xenia.ragiadakou@amd.com \
--cc=zzyiwei@gmail.com \
/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.