From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Wed, 23 Jul 2014 17:10:08 +0000 (+0100)
Subject: st/gbm: retrieve the driver-name via dd_driver_name()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d93ae21939a0b12e32263dfc14ad672c78d1c2b2;p=mesa.git

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 <emil.l.velikov@gmail.com>
---

diff --git a/src/gallium/state_trackers/gbm/gbm_drm.c b/src/gallium/state_trackers/gbm/gbm_drm.c
index bfd48a001bd..077d51806c5 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: