Changeset 59236 in vbox

Timestamp:

Dec 31, 2015 10:50:20 AM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

104864

Message:

bugref:8087: Additions/x11: support non-root X server: in the kernel driver, read video mode hints (virtual monitor hot-plug events) from the new interface in the virtual graphics card instead of relying on user space to relay them. We still do not handle the (still untested!) hot-plug interrupts which the host sends.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (2 diffs)
• vbox_fb.c (modified) (2 diffs)
• vbox_main.c (modified) (3 diffs)
• vbox_mode.c (modified) (7 diffs)

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

@@ -102 +102 @@
     /** Amount of available VRAM, not including space used for buffers. */
     uint32_t vram_size;
+    /** Array of structures for receiving mode hints. */
+    VBVAMODEHINT *paVBVAModeHints;
 
     struct vbox_fbdev *fbdev;
@@ -127 +129 @@
     struct drm_connector base;
     char szName[32];
+    unsigned iCrtc;
     /** Device attribute for sysfs file used for receiving mode hints from user
      * space. */

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

@@ -74 +74 @@
  * We re-enable VBVA if necessary when we get dirty rectangle information, as
  * the owner should not be sending that if they plan to programme the card
- * themselves. */
+ * themselves.  Update: we also do the same for reporting hot-plug support. I
+ * wonder whether we should allow it at all on the console. */
 static int VBoxSetPar(struct fb_info *pInfo)
 {
@@ -88 +89 @@
     for (i = 0; i < pVBox->cCrtcs; ++i)
         VBoxVBVADisable(&pVBox->paVBVACtx[i], &pVBox->Ctx, i);
+    VBoxHGSMISendCapsInfo(&pVBox->Ctx, 0);
     return drm_fb_helper_set_par(pInfo);
 }

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

@@ -103 +103 @@
                 if (!VBoxVBVAEnable(&vbox->paVBVACtx[iCrtc], &vbox->Ctx, pVBVA, iCrtc))
                     AssertReleaseMsgFailed(("VBoxVBVAEnable failed - heap allocation error, very old host or driver error.\n"));
+                /* Assume that if the user knows to send dirty rectangle information
+                 * they can also handle hot-plug events. */
+                VBoxHGSMISendCapsInfo(&vbox->Ctx, VBVACAPS_VIDEO_MODE_HINTS | VBVACAPS_DISABLE_CURSOR_INTEGRATION);
             }
             if (   CRTC_FB(crtc) != fb
@@ -271 +274 @@
 
 
+/** Do we support the 4.3 plus mode hint reporting interface? */
+static bool haveHGSMIModeHintAndCursorReportingInterface(struct vbox_private *pVBox)
+{
+    uint32_t fModeHintReporting, fCursorReporting;
+
+    return    RT_SUCCESS(VBoxQueryConfHGSMI(&pVBox->Ctx, VBOX_VBVA_CONF32_MODE_HINT_REPORTING, &fModeHintReporting))
+           && RT_SUCCESS(VBoxQueryConfHGSMI(&pVBox->Ctx, VBOX_VBVA_CONF32_GUEST_CURSOR_REPORTING, &fCursorReporting))
+           && fModeHintReporting == VINF_SUCCESS
+           && fCursorReporting == VINF_SUCCESS;
+}
+
+
 /** Set up our heaps and data exchange buffers in VRAM before handing the rest
  *  to the memory manager. */
@@ -292 +307 @@
     /* Linux drm represents monitors as a 32-bit array. */
     pVBox->cCrtcs = RT_MIN(VBoxHGSMIGetMonitorCount(&pVBox->Ctx), 32);
+    if (!haveHGSMIModeHintAndCursorReportingInterface(pVBox))
+        return -ENOTSUPP;
+    pVBox->paVBVAModeHints = kzalloc(sizeof(VBVAMODEHINT) * pVBox->cCrtcs, GFP_KERNEL);
+    if (!pVBox->paVBVAModeHints)
+        return -ENOMEM;
     return vbox_vbva_init(pVBox);
 }

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

@@ -98 +98 @@
                                 pitch, width, height,
                                 vbox_crtc->fBlanked ? 0 : cBPP, fFlags);
+    VBoxHGSMISendCapsInfo(&vbox->Ctx, VBVACAPS_VIDEO_MODE_HINTS | VBVACAPS_DISABLE_CURSOR_INTEGRATION);
     LogFunc(("vboxvideo: %d\n", __LINE__));
 }
@@ -409 +410 @@
 }
 
+static void vboxUpdateHints(struct vbox_connector *pVBoxConnector)
+{
+    struct vbox_private *pVBox;
+    int rc;
+
+    LogFunc(("vboxvideo: %d: pVBoxConnector=%p\n", __LINE__, pVBoxConnector));
+    pVBox = pVBoxConnector->base.dev->dev_private;
+    rc = VBoxHGSMIGetModeHints(&pVBox->Ctx, pVBox->cCrtcs, pVBox->paVBVAModeHints);
+    AssertMsgRCReturnVoid(rc, ("VBoxHGSMIGetModeHints failed, rc=%Rrc.\n", rc));
+    if (pVBox->paVBVAModeHints[pVBoxConnector->iCrtc].magic == VBVAMODEHINT_MAGIC)
+    {
+        pVBoxConnector->modeHint.cX = pVBox->paVBVAModeHints[pVBoxConnector->iCrtc].cx & 0x8fff;
+        pVBoxConnector->modeHint.cY = pVBox->paVBVAModeHints[pVBoxConnector->iCrtc].cy & 0x8fff;
+        pVBoxConnector->modeHint.fDisconnected = !(pVBox->paVBVAModeHints[pVBoxConnector->iCrtc].fEnabled);
+        LogFunc(("vboxvideo: %d: cX=%u, cY=%u, fDisconnected=%RTbool\n", __LINE__,
+                 (unsigned)pVBoxConnector->modeHint.cX, (unsigned)pVBoxConnector->modeHint.cY,
+                 pVBoxConnector->modeHint.fDisconnected));
+    }
+}
+
 static int vbox_get_modes(struct drm_connector *pConnector)
 {
@@ -418 +439 @@
     LogFunc(("vboxvideo: %d: pConnector=%p\n", __LINE__, pConnector));
     pVBoxConnector = to_vbox_connector(pConnector);
+    vboxUpdateHints(pVBoxConnector);
     cModes = drm_add_modes_noedid(pConnector, 2560, 1600);
     cxPreferred = pVBoxConnector->modeHint.cX ? pVBoxConnector->modeHint.cX : 1024;
@@ -462 +484 @@
     LogFunc(("vboxvideo: %d: connector=%p\n", __LINE__, pConnector));
     pVBoxConnector = to_vbox_connector(pConnector);
+    vboxUpdateHints(pVBoxConnector);
     return !pVBoxConnector->modeHint.fDisconnected;
 }
@@ -503 +526 @@
 {
     struct vbox_connector *pVBoxConnector;
-    struct drm_device *pDrmDev;
     struct vbox_private *pVBox;
-    int cX, cY;
-    char ch;
 
     LogFunc(("vboxvideo: %d: pDev=%p, pAttr=%p, psz=%s, cch=%llu\n", __LINE__,
@@ -512 +532 @@
     pVBoxConnector = container_of(pAttr, struct vbox_connector,
                                   deviceAttribute);
-    pDrmDev = pVBoxConnector->base.dev;
-    pVBox = pDrmDev->dev_private;
-    if (sscanf(psz, "%5dx%5d\n%c", &cX, &cY, &ch) != 2)
-        return -EINVAL;
-    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;
-    }
+    pVBox = pVBoxConnector->base.dev->dev_private;
     drm_kms_helper_hotplug_event(pVBoxConnector->base.dev);
     if (pVBox->fbdev)
         drm_fb_helper_hotplug_event(&pVBox->fbdev->helper);
-    LogFunc(("vboxvideo: %d\n", __LINE__));
     return cch;
 }
@@ -552 +553 @@
 
     pConnector = &pVBoxConnector->base;
+    pVBoxConnector->iCrtc = cScreen;
 
     /*