---

yaml --- r: 269567 b: refs/heads/master c: 654a4ef h: refs/heads/master i: 269565: 17c188b 269563: 714f227 269559: 6ccc817 269551: 807e712 269535: d4e78d3 269503: 0bf35c5 269439: 1ded5f9 269311: e1964ef v: v3
git-mirror · Sep 1, 2011 · 551d3ab · 551d3ab
1 parent 1e6c393
commit 551d3ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3ed74027f1dd197b7e08247a40d3bf9be1852b0
+refs/heads/master: 654a4ef07a53c6b20e5411718e3aebe04c6a985f
diff --git a/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/trunk/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -340,9 +340,16 @@ static enum drm_connector_status
 	vmw_ldu_connector_detect(struct drm_connector *connector,
 				 bool force)
 {
-	if (vmw_connector_to_ldu(connector)->pref_active)
-		return connector_status_connected;
-	return connector_status_disconnected;
+	uint32_t num_displays;
+	struct drm_device *dev = connector->dev;
+	struct vmw_private *dev_priv = vmw_priv(dev);
+
+	mutex_lock(&dev_priv->hw_mutex);
+	num_displays = vmw_read(dev_priv, SVGA_REG_NUM_DISPLAYS);
+	mutex_unlock(&dev_priv->hw_mutex);
+
+	return ((vmw_connector_to_ldu(connector)->base.unit < num_displays) ?
+		connector_status_connected : connector_status_disconnected);
 }
 
 static const struct drm_display_mode vmw_ldu_connector_builtin[] = {