i915: Make EGL_i915 segfault if modesetting is not working
authorJakob Bornecrantz <jakob@tungstengraphics.com>
Tue, 27 May 2008 23:18:45 +0000 (01:18 +0200)
committerJakob Bornecrantz <jakob@heavy.lan>
Wed, 28 May 2008 09:55:27 +0000 (10:55 +0100)
src/gallium/winsys/egl_drm/intel/intel_egl.c

index ac18252..12eeff2 100644 (file)
@@ -114,6 +114,7 @@ drm_initialize(_EGLDriver *drv, EGLDisplay dpy, EGLint *major, EGLint *minor)
        struct drm_screen *screen = NULL;
        drmModeOutputPtr output = NULL;
        drmModeResPtr res = NULL;
+       unsigned count_outputs = 0;
 
        EGLint i;
        int fd;
@@ -131,8 +132,10 @@ drm_initialize(_EGLDriver *drv, EGLDisplay dpy, EGLint *major, EGLint *minor)
 
        drm_update_res(drm_drv);
        res = drm_drv->res;
+       if (res)
+               count_outputs = res->count_outputs;
 
-       for(i = 0; i < res->count_outputs; i++) {
+       for(i = 0; i < count_outputs; i++) {
                output = drmModeGetOutput(fd, res->outputs[i]);
 
                if (!output)