From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Tue, 27 May 2008 23:18:45 +0000 (+0200)
Subject: i915: Make EGL_i915 segfault if modesetting is not working
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c2bd95abf60a8b6ea83dce3fc67603b36f937484;p=mesa.git

i915: Make EGL_i915 segfault if modesetting is not working
---

diff --git a/src/gallium/winsys/egl_drm/intel/intel_egl.c b/src/gallium/winsys/egl_drm/intel/intel_egl.c
index ac1825210eb..12eeff2b23b 100644
--- a/src/gallium/winsys/egl_drm/intel/intel_egl.c
+++ b/src/gallium/winsys/egl_drm/intel/intel_egl.c
@@ -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)