Commit b1d38037 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

util: promote qemu_egl_rendernode_open() to libqemuutil 



vhost-user-gpu will share the same code to open a DRM node.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180713130916.4153-20-marcandre.lureau@redhat.com>

[ kraxel: buildfix: util/drm.o must be CONFIG_OPENGL not CONFIG_LINUX ]

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 242d0133

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1566,6 +1566,7 @@ S: Odd Fixes 
F: ui/

F: include/ui/

F: qapi/ui.json

F: util/drm.c



Cocoa graphics

M: Peter Maydell <peter.maydell@linaro.org>

include/qemu/drm.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef QEMU_DRM_H_

#define QEMU_DRM_H_



int qemu_drm_rendernode_open(const char *rendernode);



#endif

ui/egl-helpers.c

+2 −49
Original line number Diff line number Diff line
@@ -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"
@@ -147,57 +145,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, DisplayGLMode mode)

{

    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;

util/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -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_OPENGL) += drm.o

util/drm.c

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015-2016 Gerd Hoffmann <kraxel@redhat.com>

 *

 * 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;

}