Changeset 83142 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 24, 2020 7:24:26 PM (5 years ago)

Author:

vboxsync

Message:

bugref:9637. Sending monitor positions (offsets) from GAs to svga device since vmwgfx fails to do so.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA-SVGA.cpp (modified) (4 diffs)
• Graphics/DevVGA-SVGA.h (modified) (2 diffs)
• Graphics/DevVGA.cpp (modified) (1 diff)
• VMMDev/VMMDev.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -1290 +1290 @@
 #ifdef IN_RING3
 /**
- * Apply the current resolution settings to change the video mode.
+ * Updating screen information in API
  *
- * @returns VBox status code.
- * @param   pThis       The shared VGA state.
- * @param   pThisCC     The ring-3 VGA state.
- */
-static int vmsvgaR3ChangeMode(PVGASTATE pThis, PVGASTATECC pThisCC)
+ * @param   pThis       The The shared VGA/VMSVGA instance data.
+ * @param   pThisCC     The VGA/VMSVGA state for ring-3.
+ */
+void vmsvgaR3VBVAResize(PVGASTATE pThis, PVGASTATECC pThisCC)
 {
     int rc;
 
-    /* Always do changemode on FIFO thread. */
-    Assert(RTThreadSelf() == pThisCC->svga.pFIFOIOThread->Thread);
-
     PVMSVGAR3STATE pSVGAState = pThisCC->svga.pSvgaR3State;
-
-    pThisCC->pDrv->pfnLFBModeChange(pThisCC->pDrv, true);
-
-    if (pThis->svga.fGFBRegisters)
-    {
-        /* "For backwards compatibility, when the GFB mode registers (WIDTH,
-         * HEIGHT, PITCHLOCK, BITS_PER_PIXEL) are modified, the SVGA device
-         * deletes all screens other than screen #0, and redefines screen
-         * #0 according to the specified mode. Drivers that use
-         * SVGA_CMD_DEFINE_SCREEN should destroy or redefine screen #0."
-         */
-
-        VMSVGASCREENOBJECT *pScreen = &pSVGAState->aScreens[0];
-        pScreen->fDefined  = true;
-        pScreen->fModified = true;
-        pScreen->fuScreen  = SVGA_SCREEN_MUST_BE_SET | SVGA_SCREEN_IS_PRIMARY;
-        pScreen->idScreen  = 0;
-        pScreen->xOrigin   = 0;
-        pScreen->yOrigin   = 0;
-        pScreen->offVRAM   = 0;
-        pScreen->cbPitch   = pThis->svga.cbScanline;
-        pScreen->cWidth    = pThis->svga.uWidth;
-        pScreen->cHeight   = pThis->svga.uHeight;
-        pScreen->cBpp      = pThis->svga.uBpp;
-
-        for (unsigned iScreen = 1; iScreen < RT_ELEMENTS(pSVGAState->aScreens); ++iScreen)
-        {
-            /* Delete screen. */
-            pScreen = &pSVGAState->aScreens[iScreen];
-            if (pScreen->fDefined)
-            {
-                pScreen->fModified = true;
-                pScreen->fDefined = false;
-            }
-        }
-    }
-    else
-    {
-        /* "If Screen Objects are supported, they can be used to fully
-         * replace the functionality provided by the framebuffer registers
-         * (SVGA_REG_WIDTH, HEIGHT, etc.) and by SVGA_CAP_DISPLAY_TOPOLOGY."
-         */
-        pThis->svga.uWidth  = VMSVGA_VAL_UNINITIALIZED;
-        pThis->svga.uHeight = VMSVGA_VAL_UNINITIALIZED;
-        pThis->svga.uBpp    = VMSVGA_VAL_UNINITIALIZED;
-    }
 
     for (unsigned iScreen = 0; iScreen < RT_ELEMENTS(pSVGAState->aScreens); ++iScreen)
@@ -1401 +1351 @@
         AssertRC(rc);
     }
+}
+
+/**
+ * Apply the current resolution settings to change the video mode.
+ *
+ * @returns VBox status code.
+ * @param   pThis       The shared VGA state.
+ * @param   pThisCC     The ring-3 VGA state.
+ */
+static int vmsvgaR3ChangeMode(PVGASTATE pThis, PVGASTATECC pThisCC)
+{
+    /* Always do changemode on FIFO thread. */
+    Assert(RTThreadSelf() == pThisCC->svga.pFIFOIOThread->Thread);
+
+    PVMSVGAR3STATE pSVGAState = pThisCC->svga.pSvgaR3State;
+
+    pThisCC->pDrv->pfnLFBModeChange(pThisCC->pDrv, true);
+
+    if (pThis->svga.fGFBRegisters)
+    {
+        /* "For backwards compatibility, when the GFB mode registers (WIDTH,
+         * HEIGHT, PITCHLOCK, BITS_PER_PIXEL) are modified, the SVGA device
+         * deletes all screens other than screen #0, and redefines screen
+         * #0 according to the specified mode. Drivers that use
+         * SVGA_CMD_DEFINE_SCREEN should destroy or redefine screen #0."
+         */
+
+        VMSVGASCREENOBJECT *pScreen = &pSVGAState->aScreens[0];
+        pScreen->fDefined  = true;
+        pScreen->fModified = true;
+        pScreen->fuScreen  = SVGA_SCREEN_MUST_BE_SET | SVGA_SCREEN_IS_PRIMARY;
+        pScreen->idScreen  = 0;
+        pScreen->xOrigin   = 0;
+        pScreen->yOrigin   = 0;
+        pScreen->offVRAM   = 0;
+        pScreen->cbPitch   = pThis->svga.cbScanline;
+        pScreen->cWidth    = pThis->svga.uWidth;
+        pScreen->cHeight   = pThis->svga.uHeight;
+        pScreen->cBpp      = pThis->svga.uBpp;
+
+        for (unsigned iScreen = 1; iScreen < RT_ELEMENTS(pSVGAState->aScreens); ++iScreen)
+        {
+            /* Delete screen. */
+            pScreen = &pSVGAState->aScreens[iScreen];
+            if (pScreen->fDefined)
+            {
+                pScreen->fModified = true;
+                pScreen->fDefined = false;
+            }
+        }
+    }
+    else
+    {
+        /* "If Screen Objects are supported, they can be used to fully
+         * replace the functionality provided by the framebuffer registers
+         * (SVGA_REG_WIDTH, HEIGHT, etc.) and by SVGA_CAP_DISPLAY_TOPOLOGY."
+         */
+        pThis->svga.uWidth  = VMSVGA_VAL_UNINITIALIZED;
+        pThis->svga.uHeight = VMSVGA_VAL_UNINITIALIZED;
+        pThis->svga.uBpp    = VMSVGA_VAL_UNINITIALIZED;
+    }
+
+    vmsvgaR3VBVAResize(pThis, pThisCC);
 
     /* Last stuff. For the VGA device screenshot. */
@@ -5460 +5473 @@
 }
 
+/**
+ * Used to update screen offsets (positions) since appearently vmwgfx fails to pass correct offsets thru FIFO.
+ *
+ * @param   pInterface  The device instance.
+ * @param   cPosition   The size of the pPosition array
+ * @param   pPosition   Monitor positions. We assume for the disable monitors the positions is (-1, -1)
+ */
+DECLCALLBACK(void) vmsvgaR3PortReportMonitorPositions(PPDMIDISPLAYPORT pInterface, uint32_t cPositions, PRTPOINT pPosition)
+{
+    PVGASTATECC pThisCC = RT_FROM_MEMBER(pInterface, VGASTATECC, IPort);
+    PVGASTATE   pThis   = PDMDEVINS_2_DATA(pThisCC->pDevIns, PVGASTATE);
+
+
+    PVMSVGAR3STATE  pSVGAState = pThisCC->svga.pSvgaR3State;
+    size_t cScreenCount = RT_ELEMENTS(pSVGAState->aScreens);
+
+    VMSVGASCREENOBJECT *pScreens = pSVGAState->aScreens;
+    /* We assume cPositions is the # of outputs Xserver reports and pPosition is (-1, -1) for disabled monitors. */
+    for (unsigned i = 0; i < cPositions; ++i)
+    {
+        /* Stop walking the array once we go thru all the monitors. */
+        if (i >= cScreenCount)
+            break;
+        if ( pScreens[i].xOrigin == -1
+          || pScreens[i].yOrigin == -1)
+            continue;
+        if (   pScreens[i].xOrigin == pPosition[i].x
+            && pScreens[i].yOrigin == pPosition[i].y)
+            continue;
+        pScreens[i].xOrigin = pPosition[i].x;
+        pScreens[i].yOrigin = pPosition[i].y;
+        pScreens[i].fModified = true;
+    }
+    vmsvgaR3VBVAResize(pThis, pThisCC);
+}
 
 /**
@@ -6523 +6571 @@
 
 #endif /* IN_RING3 */
-

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.h

@@ -393 +393 @@
 DECLCALLBACK(void) vmsvgaR3PortSetViewport(PPDMIDISPLAYPORT pInterface, uint32_t uScreenId,
                                          uint32_t x, uint32_t y, uint32_t cx, uint32_t cy);
+DECLCALLBACK(void) vmsvgaR3PortReportMonitorPositions(PPDMIDISPLAYPORT pInterface, uint32_t cPositions, PRTPOINT pPosition);
 
 int vmsvgaR3Init(PPDMDEVINS pDevIns);
@@ -419 +420 @@
 
 #endif /* !VBOX_INCLUDED_SRC_Graphics_DevVGA_SVGA_h */
-

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -6590 +6590 @@
     pThisCC->IPort.pfnReportHostCursorCapabilities = vgaR3PortReportHostCursorCapabilities;
     pThisCC->IPort.pfnReportHostCursorPosition = vgaR3PortReportHostCursorPosition;
+# ifdef VBOX_WITH_VMSVGA
+    pThisCC->IPort.pfnReportMonitorPositions = vmsvgaR3PortReportMonitorPositions;
+# else
+    pThisCC->IPort.pfnReportMonitorPositions = NULL;
+# endif
+
 
 # if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -1995 +1995 @@
 }
 
+/**
+ * Handles VMMDevReq_VideoUpdateMonitorPositions.
+ *
+ * @returns VBox status code that the guest should see.
+ * @param   pThisCC         The VMMDev ring-3 instance data.
+ * @param   pReqHdr         The header of the request to handle.
+ */
+static int vmmdevReqHandler_VideoUpdateMonitorPositions(PVMMDEVCC pThisCC, VMMDevRequestHeader *pReqHdr)
+{
+    VMMDevVideoUpdateMonitorPositions *pReq = (VMMDevVideoUpdateMonitorPositions *)pReqHdr;
+    AssertMsgReturn(pReq->header.size + sizeof(RTRECT) >= sizeof(*pReq), ("%u\n", pReq->header.size), VERR_INVALID_PARAMETER);
+    if (!pThisCC->pDrv)
+    {
+        Log(("VMMDevReq_VideoUpdateMonitorPositions: Connector is NULL!!!\n"));
+        return VERR_NOT_SUPPORTED;
+    }
+    if (   pReq->cPositions > _1M /* restrict to sane range */
+        || pReq->header.size != sizeof(VMMDevVideoUpdateMonitorPositions) + pReq->cPositions * sizeof(RTPOINT) - sizeof(RTPOINT))
+    {
+        Log(("VMMDevReq_VideoUpdateMonitorPositions: cRects=%#x doesn't match size=%#x or is out of bounds\n",
+             pReq->cPositions, pReq->header.size));
+        return VERR_INVALID_PARAMETER;
+    }
+    Log(("VMMDevReq_VideoUpdateMonitorPositions %d rectangles\n", pReq->cPositions));
+    /* forward the call */
+    return pThisCC->pDrv->pfnUpdateMonitorPositions(pThisCC->pDrv, pReq->cPositions, &(pReq->aPositions[0]));
+}
 
 /**
@@ -2653 +2680 @@
     int rcRet = VINF_SUCCESS;
     Assert(*pfPostOptimize == 0);
-
     switch (pReqHdr->requestType)
     {
@@ -2807 +2833 @@
         case VMMDevReq_VideoSetVisibleRegion:
             pReqHdr->rc = vmmdevReqHandler_VideoSetVisibleRegion(pThisCC, pReqHdr);
+            break;
+
+        case VMMDevReq_VideoUpdateMonitorPositions:
+            pReqHdr->rc = vmmdevReqHandler_VideoUpdateMonitorPositions(pThisCC, pReqHdr);
             break;