From: Ben Skeggs <bskeggs@redhat.com>
Date: Fri, 28 May 2010 00:04:05 +0000 (+1000)
Subject: drm/nv50: obey dcb->duallink_possible
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=2c58077541cc6859a9a9046d9c3a4d61bdbd4f18;p=deliverable%2Flinux.git

drm/nv50: obey dcb->duallink_possible

It was once assumed that all G8x had dual-link TMDS everywhere, this isn't
actually the case - especially considering passive DP->DVI converters and
some HDMI connectors only support single-link.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 7e663a79829f..bfa65629517b 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -593,8 +593,7 @@ nouveau_connector_mode_valid(struct drm_connector *connector,
 		break;
 	case OUTPUT_TMDS:
 		if ((dev_priv->card_type >= NV_50 && !nouveau_duallink) ||
-		    (dev_priv->card_type < NV_50 &&
-		     !nv_encoder->dcb->duallink_possible))
+		    !nv_encoder->dcb->duallink_possible)
 			max_clock = 165000;
 		else
 			max_clock = 330000;