Skip to contentSkip to conversation

drm/vmwgfx: Let SVGA_REG_NUM_DISPLAYS decide output connectivity

PATCH In review Thomas Hellstrom 2 participants 2 messages Dec 16, 2010 – Dec 20, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/vmwgfx: Let SVGA_REG_NUM_DISPLAYS decide output connectivity

Makes the user able to determine the number of connected outputs from the VMware GUI.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +10 -3
index 29113c9..335c91c 100644
@@ -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 struct drm_display_mode vmw_ldu_connector_builtin[] = {
Signature · 1 line
1.6.2.5
#1 lore raw

Dave,

Please don't apply this patch. We're looking at another solution.

/Thomas

Quoted 33 lines · Thomas Hellstrom

Makes the user able to determine the number of connected outputs from the VMware GUI.

---
  drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c |   13 ++++++++++---
  1 files changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +10 -3
index 29113c9..335c91c 100644
@@ -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 struct drm_display_mode vmw_ldu_connector_builtin[] = {