[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 18/26] util: promote qemu_egl_rendernode_open() t
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 18/26] util: promote qemu_egl_rendernode_open() to libqemuutil |
Date: |
Mon, 18 Jun 2018 18:17:21 +0200 |
vhost-user-gpu will share the same code to open a DRM node.
Signed-off-by: Marc-André Lureau <address@hidden>
---
include/qemu/drm.h | 6 +++++
ui/egl-helpers.c | 51 ++---------------------------------
util/drm.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++
MAINTAINERS | 1 +
util/Makefile.objs | 1 +
5 files changed, 76 insertions(+), 49 deletions(-)
create mode 100644 include/qemu/drm.h
create mode 100644 util/drm.c
diff --git a/include/qemu/drm.h b/include/qemu/drm.h
new file mode 100644
index 0000000000..4c3e622f5c
--- /dev/null
+++ b/include/qemu/drm.h
@@ -0,0 +1,6 @@
+#ifndef QEMU_DRM_H_
+#define QEMU_DRM_H_
+
+int qemu_drm_rendernode_open(const char *rendernode);
+
+#endif
diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index 16dc3ded36..472a8aa5f0 100644
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -15,9 +15,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
-#include <glob.h>
-#include <dirent.h>
-
+#include "qemu/drm.h"
#include "qemu/error-report.h"
#include "ui/console.h"
#include "ui/egl-helpers.h"
@@ -146,57 +144,12 @@ int qemu_egl_rn_fd;
struct gbm_device *qemu_egl_rn_gbm_dev;
EGLContext qemu_egl_rn_ctx;
-static int qemu_egl_rendernode_open(const char *rendernode)
-{
- DIR *dir;
- struct dirent *e;
- int r, fd;
- char *p;
-
- if (rendernode) {
- return open(rendernode, O_RDWR | O_CLOEXEC | O_NOCTTY | O_NONBLOCK);
- }
-
- dir = opendir("/dev/dri");
- if (!dir) {
- return -1;
- }
-
- fd = -1;
- while ((e = readdir(dir))) {
- if (e->d_type != DT_CHR) {
- continue;
- }
-
- if (strncmp(e->d_name, "renderD", 7)) {
- continue;
- }
-
- p = g_strdup_printf("/dev/dri/%s", e->d_name);
-
- r = open(p, O_RDWR | O_CLOEXEC | O_NOCTTY | O_NONBLOCK);
- if (r < 0) {
- g_free(p);
- continue;
- }
- fd = r;
- g_free(p);
- break;
- }
-
- closedir(dir);
- if (fd < 0) {
- return -1;
- }
- return fd;
-}
-
int egl_rendernode_init(const char *rendernode)
{
qemu_egl_rn_fd = -1;
int rc;
- qemu_egl_rn_fd = qemu_egl_rendernode_open(rendernode);
+ qemu_egl_rn_fd = qemu_drm_rendernode_open(rendernode);
if (qemu_egl_rn_fd == -1) {
error_report("egl: no drm render node available");
goto err;
diff --git a/util/drm.c b/util/drm.c
new file mode 100644
index 0000000000..a23ff24538
--- /dev/null
+++ b/util/drm.c
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2015-2016 Gerd Hoffmann <address@hidden>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+#include "qemu/osdep.h"
+#include "qemu/drm.h"
+
+#include <glob.h>
+#include <dirent.h>
+
+int qemu_drm_rendernode_open(const char *rendernode)
+{
+ DIR *dir;
+ struct dirent *e;
+ int r, fd;
+ char *p;
+
+ if (rendernode) {
+ return open(rendernode, O_RDWR | O_CLOEXEC | O_NOCTTY | O_NONBLOCK);
+ }
+
+ dir = opendir("/dev/dri");
+ if (!dir) {
+ return -1;
+ }
+
+ fd = -1;
+ while ((e = readdir(dir))) {
+ if (e->d_type != DT_CHR) {
+ continue;
+ }
+
+ if (strncmp(e->d_name, "renderD", 7)) {
+ continue;
+ }
+
+ p = g_strdup_printf("/dev/dri/%s", e->d_name);
+
+ r = open(p, O_RDWR | O_CLOEXEC | O_NOCTTY | O_NONBLOCK);
+ if (r < 0) {
+ g_free(p);
+ continue;
+ }
+ fd = r;
+ g_free(p);
+ break;
+ }
+
+ closedir(dir);
+ if (fd < 0) {
+ return -1;
+ }
+ return fd;
+}
diff --git a/MAINTAINERS b/MAINTAINERS
index e5dee15967..42a5d46acd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1533,6 +1533,7 @@ S: Odd Fixes
F: ui/
F: include/ui/
F: qapi/ui.json
+F: util/drm.c
Cocoa graphics
M: Peter Maydell <address@hidden>
diff --git a/util/Makefile.objs b/util/Makefile.objs
index e1c3fed4dc..1810f970ef 100644
--- a/util/Makefile.objs
+++ b/util/Makefile.objs
@@ -49,3 +49,4 @@ util-obj-y += stats64.o
util-obj-y += systemd.o
util-obj-y += iova-tree.o
util-obj-$(CONFIG_LINUX) += vfio-helpers.o
+util-obj-$(CONFIG_LINUX) += drm.o
--
2.18.0.rc1
- Re: [Qemu-devel] [PATCH v3 10/26] vhost-user: split vhost_user_read(), (continued)
[Qemu-devel] [PATCH v3 11/26] vhost-user: add vhost_user_input_get_config(), Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 12/26] libvhost-user: export vug_source_new(), Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 13/26] contrib: add vhost-user-input, Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 14/26] Add vhost-user-input-pci, Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 15/26] vhost-user: add vhost_user_gpu_set_socket(), Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 16/26] vhost-user: add vhost_user_gpu_get_num_capsets(), Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 18/26] util: promote qemu_egl_rendernode_open() to libqemuutil,
Marc-André Lureau <=
[Qemu-devel] [PATCH v3 21/26] virtio-gpu: remove unused config_size, Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 22/26] virtio-gpu: block both 2d and 3d rendering, Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 20/26] virtio-gpu: remove unused qdev, Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 17/26] virtio: add virtio-gpu bswap helpers header, Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 23/26] virtio-gpu: remove useless 'waiting' field, Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 19/26] contrib: add vhost-user-gpu, Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 25/26] virtio-gpu: split virtio-gpu-pci & virtio-vga, Marc-André Lureau, 2018/06/18
[Qemu-devel] [PATCH v3 24/26] virtio-gpu: split virtio-gpu, introduce virtio-gpu-base, Marc-André Lureau, 2018/06/18