From bfdddd218ec3e7ce3f8e765b93af35661a7bf0fd Mon Sep 17 00:00:00 2001
From: Jesse Barnes <jbarnes@nietzche.virtuousgeek.org>
Date: Thu, 24 Jan 2008 20:59:51 -0800
Subject: Fixup modeset ioctl number & typedef usage

Should be 0x08 rather than 0xa0, and shouldn't use typedefs.
---
 linux-core/drm_irq.c | 12 +++---------
 shared-core/drm.h    | 14 ++++++--------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c
index 2a5a4539..367d2dd8 100644
--- a/linux-core/drm_irq.c
+++ b/linux-core/drm_irq.c
@@ -397,23 +397,17 @@ EXPORT_SYMBOL(drm_vblank_put);
 int drm_modeset_ctl(struct drm_device *dev, void *data,
 		    struct drm_file *file_priv)
 {
-	drm_modeset_ctl_t __user *argp = (void __user *)data;
-	drm_modeset_ctl_t modeset;
+	struct drm_modeset_ctl *modeset = data;
 	int crtc, ret = 0;
 	u32 new;
 
-	if (copy_from_user(&modeset, argp, sizeof(modeset))) {
-		ret = -EFAULT;
-		goto out;
-	}
-
-	crtc = modeset.arg;
+	crtc = modeset->arg;
 	if (crtc >= dev->num_crtcs) {
 		ret = -EINVAL;
 		goto out;
 	}
 
-	switch (modeset.cmd) {
+	switch (modeset->cmd) {
 	case _DRM_PRE_MODESET:
 		dev->vblank_premodeset[crtc] =
 			dev->driver->get_vblank_counter(dev, crtc);
diff --git a/shared-core/drm.h b/shared-core/drm.h
index 52de596b..6c134566 100644
--- a/shared-core/drm.h
+++ b/shared-core/drm.h
@@ -555,20 +555,20 @@ union drm_wait_vblank {
 	struct drm_wait_vblank_reply reply;
 };
 
-typedef enum {
+enum drm_modeset_ctl_cmd {
 	_DRM_PRE_MODESET = 1,
 	_DRM_POST_MODESET = 2,
-} drm_modeset_ctl_cmd_t;
+};
 
 /**
  * DRM_IOCTL_MODESET_CTL ioctl argument type
  *
  * \sa drmModesetCtl().
  */
-typedef struct drm_modeset_ctl {
+struct drm_modeset_ctl {
 	unsigned long arg;
-	drm_modeset_ctl_cmd_t cmd;
-} drm_modeset_ctl_t;
+	enum drm_modeset_ctl_cmd cmd;
+};
 
 /**
  * DRM_IOCTL_AGP_ENABLE ioctl argument type.
@@ -969,6 +969,7 @@ struct drm_mm_init_arg {
 #define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, struct drm_client)
 #define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, struct drm_stats)
 #define DRM_IOCTL_SET_VERSION		DRM_IOWR(0x07, struct drm_set_version)
+#define DRM_IOCTL_MODESET_CTL           DRM_IOW(0x08, struct drm_modeset_ctl)
 
 #define DRM_IOCTL_SET_UNIQUE		DRM_IOW( 0x10, struct drm_unique)
 #define DRM_IOCTL_AUTH_MAGIC		DRM_IOW( 0x11, struct drm_auth)
@@ -1041,9 +1042,6 @@ struct drm_mm_init_arg {
 #define DRM_IOCTL_BO_WAIT_IDLE          DRM_IOWR(0xd5, struct drm_bo_map_wait_idle_arg)
 #define DRM_IOCTL_BO_VERSION          DRM_IOR(0xd6, struct drm_bo_version_arg)
 
-
-#define DRM_IOCTL_MODESET_CTL           DRM_IOW(0xa0, drm_modeset_ctl_t)
-
 /*@}*/
 
 /**
-- 
cgit v1.2.3