diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2021-03-12 14:00:44 +0400 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2021-03-26 06:37:03 +0100 |
| commit | 96ee096a1332086285c98d92f750ea0c3cb32564 (patch) | |
| tree | b161ba3a1b5d066a1957865eb342047b42e49f38 /contrib/vhost-user-gpu/vhost-user-gpu.c | |
| parent | 0c27b9c5687fd276e26c3a95ca6d89f792fc7a1c (diff) | |
| download | focaccia-qemu-96ee096a1332086285c98d92f750ea0c3cb32564.tar.gz focaccia-qemu-96ee096a1332086285c98d92f750ea0c3cb32564.zip | |
vhost-user-gpu: fix vugbm_device_init fallback
vugbm implements GBM device wrapping, udmabuf and memory fallback. However, the fallback/detection logic is flawed, as if "/dev/udmabuf" failed to be opened, it will not initialize vugbm and crash later. Rework the vugbm_device_init() logic to initialize correctly in all cases. Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20210312100108.2706195-4-marcandre.lureau@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'contrib/vhost-user-gpu/vhost-user-gpu.c')
| -rw-r--r-- | contrib/vhost-user-gpu/vhost-user-gpu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/vhost-user-gpu/vhost-user-gpu.c b/contrib/vhost-user-gpu/vhost-user-gpu.c index b27990ffdb..ef40fbccbb 100644 --- a/contrib/vhost-user-gpu/vhost-user-gpu.c +++ b/contrib/vhost-user-gpu/vhost-user-gpu.c @@ -1186,11 +1186,7 @@ main(int argc, char *argv[]) exit(EXIT_FAILURE); } - if (g.drm_rnode_fd >= 0) { - if (!vugbm_device_init(&g.gdev, g.drm_rnode_fd)) { - g_warning("Failed to init DRM device, using fallback path"); - } - } + vugbm_device_init(&g.gdev, g.drm_rnode_fd); if ((!!opt_socket_path + (opt_fdnum != -1)) != 1) { g_printerr("Please specify either --fd or --socket-path\n"); |