[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 09/20] ui: remove console_has_gl_dmabuf()
From: |
marcandre . lureau |
Subject: |
[PATCH v2 09/20] ui: remove console_has_gl_dmabuf() |
Date: |
Thu, 4 Feb 2021 14:52:21 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
This check is currently limited. It only is used by vhost-user-gpu (not
by vfio-display), and will print an error repeatedly during run-time.
We are going to dissociate the GL context from the
DisplayChangeListener, and listeners may come and go. The following
patches will address this differently.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
include/ui/console.h | 1 -
hw/display/vhost-user-gpu.c | 5 -----
ui/console.c | 5 -----
3 files changed, 11 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index bea2b6329a..ac989fdf70 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -323,7 +323,6 @@ void dpy_gl_ctx_destroy(QemuConsole *con, QEMUGLContext
ctx);
int dpy_gl_ctx_make_current(QemuConsole *con, QEMUGLContext ctx);
bool console_has_gl(QemuConsole *con);
-bool console_has_gl_dmabuf(QemuConsole *con);
static inline int surface_stride(DisplaySurface *s)
{
diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index 55b0ed15f2..dd587436ff 100644
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -224,11 +224,6 @@ vhost_user_gpu_handle_display(VhostUserGPU *g,
VhostUserGpuMsg *msg)
close(dmabuf->fd);
dmabuf->fd = -1;
}
- if (!console_has_gl_dmabuf(con)) {
- /* it would be nice to report that error earlier */
- error_report("console doesn't support dmabuf!");
- break;
- }
dpy_gl_release_dmabuf(con, dmabuf);
if (fd == -1) {
dpy_gl_scanout_disable(con);
diff --git a/ui/console.c b/ui/console.c
index ab9224429e..b5bc3f7699 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1463,11 +1463,6 @@ bool console_has_gl(QemuConsole *con)
return con->gl != NULL;
}
-bool console_has_gl_dmabuf(QemuConsole *con)
-{
- return con->gl != NULL && con->gl->ops->dpy_gl_scanout_dmabuf != NULL;
-}
-
void register_displaychangelistener(DisplayChangeListener *dcl)
{
static const char nodev[] =
--
2.29.0
- [PATCH v2 01/20] vhost-user-gpu: check backend for EDID support, (continued)
- [PATCH v2 01/20] vhost-user-gpu: check backend for EDID support, marcandre . lureau, 2021/02/04
- [PATCH v2 02/20] vhost-user-gpu: handle vhost-user-gpu features in a callback, marcandre . lureau, 2021/02/04
- [PATCH v2 03/20] vhost-user-gpu: use an extandable state enum for commands, marcandre . lureau, 2021/02/04
- [PATCH v2 04/20] vhost-user-gpu: handle display-info in a callback, marcandre . lureau, 2021/02/04
- [PATCH v2 05/20] ui: remove extra #ifdef CONFIG_OPENGL, marcandre . lureau, 2021/02/04
- [PATCH v2 06/20] ui: remove gl_ctx_get_current, marcandre . lureau, 2021/02/04
- [PATCH v2 07/20] ui: add gd_gl_area_scanout_disable, marcandre . lureau, 2021/02/04
- [PATCH v2 08/20] ui: annotate DCLOps callback requirements, marcandre . lureau, 2021/02/04
- [PATCH v2 09/20] ui: remove console_has_gl_dmabuf(),
marcandre . lureau <=
- [PATCH v2 10/20] vhost-user-gpu: add a configuration flag for dmabuf usage, marcandre . lureau, 2021/02/04
- [PATCH v2 11/20] ui: add an optional get_flags callback to GraphicHwOps, marcandre . lureau, 2021/02/04
- [PATCH v2 12/20] ui: add a DCLOps callback to check dmabuf support, marcandre . lureau, 2021/02/04
- [PATCH v2 13/20] ui: check hw requirements during DCL registration, marcandre . lureau, 2021/02/04
- [PATCH v2 14/20] ui: add qemu_egl_has_dmabuf helper, marcandre . lureau, 2021/02/04
- [PATCH v2 15/20] ui: check gtk-egl dmabuf support, marcandre . lureau, 2021/02/04
- [PATCH v2 16/20] ui: add egl dmabuf import to gtkglarea, marcandre . lureau, 2021/02/04
- [PATCH v2 17/20] virtio-gpu: avoid re-entering cmdq processing, marcandre . lureau, 2021/02/04
- [PATCH v2 18/20] display/ui: add a callback to indicate GL state is flushed, marcandre . lureau, 2021/02/04