From dfe2135a812590aeb03866fd6e8fb8d23381737f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
Date: Thu, 8 Nov 2012 09:09:42 +0000
Subject: [PATCH] --- yaml --- r: 345307 b: refs/heads/master c:
 e3cc3520dc2f554b9686b8fc5773d8b8bc8e9c9a h: refs/heads/master i:   345305:
 4433f9175383c66215e20de250a286af680e6b0f   345303:
 a9a4d795d28ae263a30a5e3dc46fcbd97df538c0 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/gpu/drm/drm_crtc.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a5f6e3ed2b3d..2591d1e135bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c9287c6009b37754c42e0ba73a4cc79de92d8f8
+refs/heads/master: e3cc3520dc2f554b9686b8fc5773d8b8bc8e9c9a
diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c
index 35336097fb47..7ac3952f74fc 100644
--- a/trunk/drivers/gpu/drm/drm_crtc.c
+++ b/trunk/drivers/gpu/drm/drm_crtc.c
@@ -2331,6 +2331,11 @@ int drm_mode_addfb2(struct drm_device *dev,
 	if (!drm_core_check_feature(dev, DRIVER_MODESET))
 		return -EINVAL;
 
+	if (r->flags & ~DRM_MODE_FB_INTERLACED) {
+		DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags);
+		return -EINVAL;
+	}
+
 	if ((config->min_width > r->width) || (r->width > config->max_width)) {
 		DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n",
 			  r->width, config->min_width, config->max_width);