Update the DRM to the latest from DRI CVS. Includes some bugfixes and removal

of the infrastructure for the gamma driver which was removed a while back.
The DRM_LINUX option is removed because the handler is now provided by the
linux compat code itself.

1 files changed, 7 insertions, 10 deletions

diff --git a/sys/dev/drm/drm_ioctl.h b/sys/dev/drm/drm_ioctl.h
index 4826faf..88074b4 100644
--- a/sys/dev/drm/drm_ioctl.h
+++ b/sys/dev/drm/drm_ioctl.h
@@ -121,15 +121,6 @@ int DRM(setunique)( DRM_IOCTL_ARGS )
 
 	dev->unique[dev->unique_len] = '\0';
 
-	dev->devname = DRM(alloc)(strlen(dev->name) + strlen(dev->unique) + 2,
-				  DRM_MEM_DRIVER);
-	if(!dev->devname) {
-		DRM(free)(dev->devname, sizeof(*dev->devname), DRM_MEM_DRIVER);
-		return DRM_ERR(ENOMEM);
-	}
-	sprintf(dev->devname, "%s@%s", dev->name, dev->unique);
-
-
 	return 0;
 }
 
@@ -148,7 +139,7 @@ int DRM(getmap)( DRM_IOCTL_ARGS )
 	idx = map.offset;
 
 	DRM_LOCK;
-	if (idx < 0 || idx >= dev->map_count) {
+	if (idx < 0) {
 		DRM_UNLOCK;
 		return DRM_ERR(EINVAL);
 	}
@@ -239,3 +230,9 @@ int DRM(getstats)( DRM_IOCTL_ARGS )
 
 	return 0;
 }
+
+int DRM(noop)(DRM_IOCTL_ARGS)
+{
+	DRM_DEBUG("\n");
+	return 0;
+}