Merge remote branch 'origin/master' into radeon-rewrite

Conflicts:
	src/mesa/drivers/dri/r200/r200_tex.c
	src/mesa/drivers/dri/r300/r300_cmdbuf.c
	src/mesa/drivers/dri/r300/r300_context.h
	src/mesa/drivers/dri/r300/r300_swtcl.c
	src/mesa/drivers/dri/r300/r300_tex.c
	src/mesa/drivers/dri/r300/r300_texmem.c
	src/mesa/drivers/dri/r300/r300_texstate.c
	src/mesa/drivers/dri/radeon/radeon_tex.c

1 files changed, 28 insertions, 1 deletions

diff --git a/src/gallium/state_trackers/egl/egl_tracker.c b/src/gallium/state_trackers/egl/egl_tracker.c
index a22ef381b9..abdf84544f 100644
--- a/src/gallium/state_trackers/egl/egl_tracker.c
+++ b/src/gallium/state_trackers/egl/egl_tracker.c
@@ -66,10 +66,13 @@ drm_get_device_id(struct drm_device *device)
 {
 	char path[512];
 	FILE *file;
+	char *ret;
 
 	/* TODO get the real minor */
 	int minor = 0;
 
+	device->deviceID = 0;
+
 	snprintf(path, sizeof(path), "/sys/class/drm/card%d/device/device", minor);
 	file = fopen(path, "r");
 	if (!file) {
@@ -77,7 +80,10 @@ drm_get_device_id(struct drm_device *device)
 		return;
 	}
 
-	fgets(path, sizeof( path ), file);
+	ret = fgets(path, sizeof( path ), file);
+	if (!ret)
+		return;
+
 	sscanf(path, "%x", &device->deviceID);
 	fclose(file);
 }
@@ -101,6 +107,25 @@ drm_add_modes_from_connector(_EGLScreen *screen, drmModeConnectorPtr connector)
 	}
 }
 
+static void
+drm_find_dpms(struct drm_device *dev, struct drm_screen *screen)
+{
+	drmModeConnectorPtr c = screen->connector;
+	drmModePropertyPtr p;
+	int i;
+
+	for (i = 0; i < c->count_props; i++) {
+		p = drmModeGetProperty(dev->drmFD, c->props[i]);
+		if (!strcmp(p->name, "DPMS"))
+			break;
+
+		drmModeFreeProperty(p);
+		p = NULL;
+	}
+
+	screen->dpms = p;
+}
+
 EGLBoolean
 drm_initialize(_EGLDriver *drv, EGLDisplay dpy, EGLint *major, EGLint *minor)
 {
@@ -154,6 +179,7 @@ drm_initialize(_EGLDriver *drv, EGLDisplay dpy, EGLint *major, EGLint *minor)
 		_eglInitScreen(&screen->base);
 		_eglAddScreen(disp, &screen->base);
 		drm_add_modes_from_connector(&screen->base, connector);
+		drm_find_dpms(dev, screen);
 		dev->screens[num_screens++] = screen;
 	}
 	dev->count_screens = num_screens;
@@ -200,6 +226,7 @@ drm_terminate(_EGLDriver *drv, EGLDisplay dpy)
 		if (screen->shown)
 			drm_takedown_shown_screen(drv, screen);
 
+		drmModeFreeProperty(screen->dpms);
 		drmModeFreeConnector(screen->connector);
 		_eglDestroyScreen(&screen->base);
 		dev->screens[i] = NULL;