---

yaml --- r: 205091 b: refs/heads/master c: a5afb77 h: refs/heads/master i: 205089: dda71f5 205087: 4ce8679 v: v3
git-mirror · Jul 26, 2010 · 9d3ffaa · 9d3ffaa
1 parent 86f692e
commit 9d3ffaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eae6192a9d0d31f657b50873789175794767bf38
+refs/heads/master: a5afb7758fcf558d6a8cd2546bc18aeedfc6192a
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c b/trunk/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -506,7 +506,8 @@ nouveau_connector_native_mode(struct drm_connector *connector)
 	int high_w = 0, high_h = 0, high_v = 0;
 
 	list_for_each_entry(mode, &nv_connector->base.probed_modes, head) {
-		if (helper->mode_valid(connector, mode) != MODE_OK)
+		if (helper->mode_valid(connector, mode) != MODE_OK ||
+		    (mode->flags & DRM_MODE_FLAG_INTERLACE))
 			continue;
 
 		/* Use preferred mode if there is one.. */