Module: Mesa Branch: master Commit: d93ae21939a0b12e32263dfc14ad672c78d1c2b2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d93ae21939a0b12e32263dfc14ad672c78d1c2b2
Author: Emil Velikov <[email protected]> Date: Wed Jul 23 18:10:08 2014 +0100 st/gbm: retrieve the driver-name via dd_driver_name() ... on static targets. Otherwise we'll crash badly as gdrm->dev is NULL when we try to copy the string driver_name. Signed-off-by: Emil Velikov <[email protected]> --- src/gallium/state_trackers/gbm/gbm_drm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gallium/state_trackers/gbm/gbm_drm.c b/src/gallium/state_trackers/gbm/gbm_drm.c index bfd48a0..077d518 100644 --- a/src/gallium/state_trackers/gbm/gbm_drm.c +++ b/src/gallium/state_trackers/gbm/gbm_drm.c @@ -282,7 +282,13 @@ gbm_gallium_drm_device_create(int fd) if (gdrm->screen == NULL) goto out_no_screen; +#if GALLIUM_STATIC_TARGETS + gdrm->base.driver_name = strdup(dd_driver_name()); +#else +#ifdef HAVE_PIPE_LOADER_DRM gdrm->base.driver_name = strdup(gdrm->dev->driver_name); +#endif /* HAVE_PIPE_LOADER_DRM */ +#endif return &gdrm->base.base; out_no_screen: _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
