From 9d3ffaa8174db49159bfe266785075798efad504 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Sun, 18 Jul 2010 16:19:16 +0200 Subject: [PATCH] --- yaml --- r: 205091 b: refs/heads/master c: a5afb7758fcf558d6a8cd2546bc18aeedfc6192a h: refs/heads/master i: 205089: dda71f596e06529fd9d29d617b158bcdc26c8fef 205087: 4ce8679c17cbe0b7248ac445a49a9a7b40bbfec9 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_connector.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d14fa9f85935..569538f40a9d 100644 --- 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 index 50704287a8c2..7f749d281df9 100644 --- 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.. */