mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: init linux_dmabuf support

Browse Source 
v2 changes:
- only initialize linux_dmabuf if renderer supports it

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Pekka Paalanen
2014-06-12 15:12:48 +03:00
parent 5ffb440c3f
commit e4d231ecdf
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compositor-drm.c
+17
View File
@@ -56,6 +56,7 @@
#include "launcher-util.h" #include "launcher-util.h"
#include "vaapi-recorder.h" #include "vaapi-recorder.h"
#include "presentation_timing-server-protocol.h" #include "presentation_timing-server-protocol.h"
#include "linux-dmabuf.h"
#ifndef DRM_CAP_TIMESTAMP_MONOTONIC #ifndef DRM_CAP_TIMESTAMP_MONOTONIC
#define DRM_CAP_TIMESTAMP_MONOTONIC 0x6 #define DRM_CAP_TIMESTAMP_MONOTONIC 0x6
@@ -2965,10 +2966,13 @@ static void
switch_to_gl_renderer(struct drm_backend *b) switch_to_gl_renderer(struct drm_backend *b)
{ {
struct drm_output *output; struct drm_output *output;
bool dmabuf_support_inited;
if (!b->use_pixman) if (!b->use_pixman)
return; return;
dmabuf_support_inited = !!b->compositor->renderer->import_dmabuf;
weston_log("Switching to GL renderer\n"); weston_log("Switching to GL renderer\n");
b->gbm = create_gbm_device(b->drm.fd); b->gbm = create_gbm_device(b->drm.fd);
@@ -2994,6 +2998,12 @@ switch_to_gl_renderer(struct drm_backend *b)
drm_output_init_egl(output, b); drm_output_init_egl(output, b);
b->use_pixman = 0; b->use_pixman = 0;
if (!dmabuf_support_inited && b->compositor->renderer->import_dmabuf) {
if (linux_dmabuf_setup(b->compositor) < 0)
weston_log("Error: initializing dmabuf "
"support failed.\n");
}
} }
static void static void
@@ -3154,7 +3164,14 @@ drm_backend_create(struct weston_compositor *compositor,
weston_compositor_add_debug_binding(compositor, KEY_W, weston_compositor_add_debug_binding(compositor, KEY_W,
renderer_switch_binding, b); renderer_switch_binding, b);
if (compositor->renderer->import_dmabuf) {
if (linux_dmabuf_setup(compositor) < 0)
weston_log("Error: initializing dmabuf "
"support failed.\n");
}
compositor->backend = &b->base; compositor->backend = &b->base;
return b; return b;
err_udev_monitor: err_udev_monitor: