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

clients/simple-dmabuf-egl: Properly check for error in gbm_bo_get_handle_for_plane

Browse Source 
gbm_bo_get_handle_for_plane returns handle.s32 == -1 on error, at least
for the Mesa dri implementation.

Reported-by: Marius Vlad <marius.vlad@collabora.com>
Signed-off-by: Alexandros Frantzis <alexandros.frantzis@collabora.com>
This commit is contained in:
Alexandros Frantzis 2019-03-13 12:16:29 +02:00 committed by Daniel Stone
parent fe6dd7bcef
commit ff98a9080f
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clients/simple-dmabuf-egl.c
View File

@ -369,9 +369,17 @@ create_dmabuf_buffer(struct display *display, struct buffer *buffer,
#ifdef HAVE_GBM_MODIFIERS #ifdef HAVE_GBM_MODIFIERS
buffer->plane_count = gbm_bo_get_plane_count(buffer->bo); buffer->plane_count = gbm_bo_get_plane_count(buffer->bo);
for (i = 0; i < buffer->plane_count; ++i) { for (i = 0; i < buffer->plane_count; ++i) {
uint32_t handle = gbm_bo_get_handle_for_plane(buffer->bo, i).u32; int ret;
int ret = drmPrimeHandleToFD(display->gbm.drm_fd, handle, 0, union gbm_bo_handle handle;
&buffer->dmabuf_fds[i]);
handle = gbm_bo_get_handle_for_plane(buffer->bo, i);
if (handle.s32 == -1) {
fprintf(stderr, "error: failed to get gbm_bo_handle\n");
goto error;
}
ret = drmPrimeHandleToFD(display->gbm.drm_fd, handle.u32, 0,
&buffer->dmabuf_fds[i]);
if (ret < 0 || buffer->dmabuf_fds[i] < 0) { if (ret < 0 || buffer->dmabuf_fds[i] < 0) {
fprintf(stderr, "error: failed to get dmabuf_fd\n"); fprintf(stderr, "error: failed to get dmabuf_fd\n");
goto error; goto error;