Attachment 94573 Details for Bug 75335 – targets/gbm: exit gracefully if pipe_loader_drm_probe_fd is not available

[patch] targets/gbm: exit gracefully if pipe_loader_drm_probe_fd is not available

0001-targets-gbm-exit-gracefully-if-pipe_loader_drm_probe.patch (text/plain), 1.28 KB, created by Emil Velikov on 2014-02-22 16:54:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emil Velikov

Created: 2014-02-22 16:54:23 UTC

Size: 1.28 KB

patch

obsolete

>From 62d3fe496e539f4957b006cb7d78db281937765a Mon Sep 17 00:00:00 2001
>From: Emil Velikov <emil.l.velikov@gmail.com>
>Date: Sat, 22 Feb 2014 16:20:04 +0000
>Subject: [PATCH 1/3] targets/gbm: exit gracefully if pipe_loader_drm_probe_fd
> is not available
>
>When one builds without gallium_drm_loader, the above function will
>not be available, thus we'll segfault in gallium_screen_create due
>to memory access violation.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75335
>Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
>---
> src/gallium/targets/gbm/gbm.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/src/gallium/targets/gbm/gbm.c b/src/gallium/targets/gbm/gbm.c
>index deaa401..160cbb8 100644
>--- a/src/gallium/targets/gbm/gbm.c
>+++ b/src/gallium/targets/gbm/gbm.c
>@@ -49,13 +49,14 @@ int
> gallium_screen_create(struct gbm_gallium_drm_device *gdrm)
> {
>    struct pipe_loader_device *dev;
>-#ifdef HAVE_PIPE_LOADER_DRM
>-   int ret;
>+   int ret = 0;
> 
>+#ifdef HAVE_PIPE_LOADER_DRM
>    ret = pipe_loader_drm_probe_fd(&dev, gdrm->base.base.fd, true);
>+#endif /* HAVE_PIPE_LOADER_DRM */
>+
>    if (!ret)
>       return -1;
>-#endif /* HAVE_PIPE_LOADER_DRM */
> 
>    gdrm->screen = pipe_loader_create_screen(dev, get_library_search_path());
>    if (gdrm->screen == NULL) {
>-- 
>1.9.0
>

Actions: View | Splinter Review

Attachments on bug 75335: 94573

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.