libdrm patches

[James Simmons]

Hi!
	I have started to work with the openchrome driver and was playing 
around with libdrm/libkms with it. So as a base reference I tested my work 
against the other hardware I have. While doing that I discovered a bug 
with libkms and i915. Also I found modeprint can be used by any KMS 
driver. This patch fixes i915 with libkms and builds modeprint for test 
with other drivers besides i915. It is against libdrm trunk.

Signed-off-by: James Simmons <jsimmons at infradead.org>

diff --git a/libkms/linux.c b/libkms/linux.c
index 02182d3..bc422cc 100644
--- a/libkms/linux.c
+++ b/libkms/linux.c
@@ -101,7 +101,7 @@ linux_from_sysfs(int fd, struct kms_driver **out)
 	if (ret)
 		return ret;
 
-	if (!strcmp(name, "intel"))
+	if (!strcmp(name, "i915"))
 		ret = intel_create(fd, out);
 #ifdef HAVE_VMWGFX
 	else if (!strcmp(name, "vmwgfx"))
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ebf4853..8c4a029 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -47,11 +47,10 @@ TESTS =						\
 	name_from_fd				\
 	$(NULL)
 
-SUBDIRS += vbltest $(NULL)
+SUBDIRS += vbltest modeprint $(NULL)
 
 if HAVE_INTEL
 SUBDIRS += \
-	modeprint				\
 	modetest				\
 	$(NULL)
 
diff --git a/tests/modeprint/Makefile.am b/tests/modeprint/Makefile.am
index 2ae0fdc..c4862ac 100644
--- a/tests/modeprint/Makefile.am
+++ b/tests/modeprint/Makefile.am
@@ -1,6 +1,5 @@
 AM_CFLAGS = \
 	-I$(top_srcdir)/include/drm \
-	-I$(top_srcdir)/intel/ \
 	-I$(top_srcdir)
 
 noinst_PROGRAMS = \
@@ -9,5 +8,4 @@ noinst_PROGRAMS = \
 modeprint_SOURCES = \
 	modeprint.c
 modeprint_LDADD = \
-	$(top_builddir)/libdrm.la \
-	$(top_builddir)/intel/libdrm_intel.la
+	$(top_builddir)/libdrm.la