From: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri, 11 Oct 2013 22:30:09 +0000 (-0700)
Subject: wayland: Only pass wl_drm instance to gbm when using gbm platform
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1d3492706156b2caa7eb3b84125dbabc999695aa;p=mesa.git

wayland: Only pass wl_drm instance to gbm when using gbm platform
---

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 18ecdc8df38..1089616946d 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1855,7 +1855,8 @@ dri2_bind_wayland_display_wl(_EGLDriver *drv, _EGLDisplay *disp,
 
    /* We have to share the wl_drm instance with gbm, so gbm can convert
     * wl_buffers to gbm bos. */
-   dri2_dpy->gbm_dri->wl_drm = dri2_dpy->wl_server_drm;
+   if (dri2_dpy->gbm_dri)
+      dri2_dpy->gbm_dri->wl_drm = dri2_dpy->wl_server_drm;
 
    return EGL_TRUE;
 }