Changeset 59222 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Dec 26, 2015 3:24:08 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: add knowledge of disconnected virtual monitors to the KMS driver.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_mode.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/drm/vbox_drv.h

@@ -134 +134 @@
         uint16_t cX;
         uint16_t cY;
+        bool fDisconnected;
     } modeHint;
 };

trunk/src/VBox/Additions/linux/drm/vbox_mode.c

@@ -456 +456 @@
 
 static enum drm_connector_status
-vbox_connector_detect(struct drm_connector *connector, bool force)
-{
-    return connector_status_connected;
+vbox_connector_detect(struct drm_connector *pConnector, bool fForce)
+{
+    struct vbox_connector *pVBoxConnector = NULL;
+
+    (void) fForce;
+    LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, pConnector));
+    pVBoxConnector = to_vbox_connector(pConnector);
+    return !pVBoxConnector->modeHint.fDisconnected;
 }
 
@@ -494 +499 @@
     if (sscanf(psz, "%5dx%5d\n%c", &cX, &cY, &ch) != 2)
         return -EINVAL;
-    if (   cX < 64 || cX > VBE_DISPI_MAX_XRES
-        || cY < 64 || cY > VBE_DISPI_MAX_YRES)
-        return -EINVAL;
-    pVBoxConnector->modeHint.cX = (uint16_t)cX;
-    pVBoxConnector->modeHint.cY = (uint16_t)cY;
+    if (cX == -1 && cY == -1)
+    {
+        pVBoxConnector->modeHint.fDisconnected = true;
+        pVBoxConnector->modeHint.cX = 0;
+        pVBoxConnector->modeHint.cY = 0;
+    }
+    else
+    {
+        if (   cX < 64 || cX > VBE_DISPI_MAX_XRES
+            || cY < 64 || cY > VBE_DISPI_MAX_YRES)
+            return -EINVAL;
+        pVBoxConnector->modeHint.fDisconnected = false;
+        pVBoxConnector->modeHint.cX = (uint16_t)cX;
+        pVBoxConnector->modeHint.cY = (uint16_t)cY;
+    }
     drm_helper_hpd_irq_event(pVBoxConnector->base.dev);
     if (pVBox->fbdev)