Merge commit 'origin/drm-gem' into modesetting-gem

Conflicts:
	linux-core/Makefile.kernel
	linux-core/drmP.h
	linux-core/drm_mm.c
	linux-core/drm_stub.c
	linux-core/i915_gem.c
	linux-core/i915_opregion.c
	shared-core/i915_dma.c
	shared-core/i915_drv.h
	shared-core/i915_irq.c

2 files changed, 10 insertions, 1 deletions

diff --git a/tests/gem_mmap.c b/tests/gem_mmap.c
index c3a51883..b5c15463 100644
--- a/tests/gem_mmap.c
+++ b/tests/gem_mmap.c
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 	mmap.size = 4096;
 	printf("Testing mmaping of bad object.\n");
 	ret = ioctl(fd, DRM_IOCTL_I915_GEM_MMAP, &mmap);
-	assert(ret == -1 && errno == EINVAL);
+	assert(ret == -1 && errno == EBADF);
 
 	memset(&create, 0, sizeof(create));
 	create.size = OBJECT_SIZE;
diff --git a/tests/gem_readwrite.c b/tests/gem_readwrite.c
index 54b25ea3..bd1d232b 100644
--- a/tests/gem_readwrite.c
+++ b/tests/gem_readwrite.c
@@ -94,6 +94,7 @@ int main(int argc, char **argv)
 
 	printf("Testing read beyond end of buffer.\n");
 	ret = do_read(fd, handle, buf, OBJECT_SIZE / 2, OBJECT_SIZE);
+	printf("%d %d\n", ret, errno);
 	assert(ret == -1 && errno == EINVAL);
 
 	printf("Testing full write of buffer\n");
@@ -120,6 +121,14 @@ int main(int argc, char **argv)
 	assert(ret == 0);
 	assert(memcmp(buf, expected + 512, 1024) == 0);
 
+	printf("Testing read of bad buffer handle\n");
+	ret = do_read(fd, 1234, buf, 0, 1024);
+	assert(ret == -1 && errno == EBADF);
+
+	printf("Testing write of bad buffer handle\n");
+	ret = do_write(fd, 1234, buf, 0, 1024);
+	assert(ret == -1 && errno == EBADF);
+
 	close(fd);
 
 	return 0;