From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 4 Sep 2013 01:01:42 +0000 (+1000)
Subject: drm/nv50-/kms: assume analog display connected if load on any pin
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4b31ebcf69a48d5d70cf26cea080bd0818fdd9af;p=linux.git

drm/nv50-/kms: assume analog display connected if load on any pin

Fixes a VGA monitor with a dodgy red (in this case) pin not being
detected.

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

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 9d2092a5ed382..f8e66c08b11a2 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -1583,7 +1583,7 @@ nv50_dac_detect(struct drm_encoder *encoder, struct drm_connector *connector)
 		load = 340;
 
 	ret = nv_exec(disp->core, NV50_DISP_DAC_LOAD + or, &load, sizeof(load));
-	if (ret || load != 7)
+	if (ret || !load)
 		return connector_status_disconnected;
 
 	return connector_status_connected;