From 87ddf2d9956e42174f4a29026fb67abc48f26bb2 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@vmware.com>
Date: Thu, 16 Aug 2012 08:29:03 +0000
Subject: [PATCH] --- yaml --- r: 322377 b: refs/heads/master c:
 7c4eaca4162d0b5ad4fb39f974d7ffd71b9daa09 h: refs/heads/master i:   322375:
 16bf3fd21c5fc5446bc2ae343cc7bbfb89af2cff v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpu/drm/drm_crtc.c | 2 +-
 trunk/include/drm/drm_mode.h     | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a9986089e3e6..684c15ad3235 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22f5d115a2b087c977128f84ee557ad71530330e
+refs/heads/master: 7c4eaca4162d0b5ad4fb39f974d7ffd71b9daa09
diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c
index 08a7aa722d6b..6fbfc244748f 100644
--- a/trunk/drivers/gpu/drm/drm_crtc.c
+++ b/trunk/drivers/gpu/drm/drm_crtc.c
@@ -1981,7 +1981,7 @@ int drm_mode_cursor_ioctl(struct drm_device *dev,
 	if (!drm_core_check_feature(dev, DRIVER_MODESET))
 		return -EINVAL;
 
-	if (!req->flags)
+	if (!req->flags || (~DRM_MODE_CURSOR_FLAGS & req->flags))
 		return -EINVAL;
 
 	mutex_lock(&dev->mode_config.mutex);
diff --git a/trunk/include/drm/drm_mode.h b/trunk/include/drm/drm_mode.h
index 5581980b14f6..3d6301b6ec16 100644
--- a/trunk/include/drm/drm_mode.h
+++ b/trunk/include/drm/drm_mode.h
@@ -359,8 +359,9 @@ struct drm_mode_mode_cmd {
 	struct drm_mode_modeinfo mode;
 };
 
-#define DRM_MODE_CURSOR_BO	(1<<0)
-#define DRM_MODE_CURSOR_MOVE	(1<<1)
+#define DRM_MODE_CURSOR_BO	0x01
+#define DRM_MODE_CURSOR_MOVE	0x02
+#define DRM_MODE_CURSOR_FLAGS	0x03
 
 /*
  * depending on the value in flags different members are used.