Changeset 53528 in vbox for trunk/src/VBox

Timestamp:

Dec 12, 2014 8:22:39 PM (10 years ago)

Author:

vboxsync

Message:

Devices/Graphics, Devices/PC/DevACPI, Main: add support for sending video mode hints through the VGA device.

Location:

trunk/src/VBox

Files:

• Devices/Graphics/DevVGA.cpp (modified) (1 diff)
• Devices/Graphics/DevVGA.h (modified) (1 diff)
• Devices/Graphics/DevVGA_VBVA.cpp (modified) (8 diffs)
• Devices/PC/DevACPI.cpp (modified) (2 diffs)
• Devices/PC/vbox.dsl (modified) (1 diff)
• Main/include/ConsoleImpl.h (modified) (1 diff)
• Main/include/DisplayImpl.h (modified) (4 diffs)
• Main/src-client/ConsoleImpl.cpp (modified) (1 diff)
• Main/src-client/DisplayImpl.cpp (modified) (6 diffs)
• Main/src-client/GuestImpl.cpp (modified) (1 diff)
• Main/src-client/VMMDevInterface.cpp (modified) (1 diff)

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

@@ -6062 +6062 @@
     pThis->IPort.pfnSetViewPort         = vmsvgaPortSetViewPort;
 #endif
+    pThis->IPort.pfnSendModeHint        = vbvaPortSendModeHint;
 
 #if defined(VBOX_WITH_HGSMI)

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

@@ -686 +686 @@
 
 DECLCALLBACK(int) vgaUpdateDisplayAll(PVGASTATE pThis, bool fFailOnResize);
+DECLCALLBACK(int) vbvaPortSendModeHint(PPDMIDISPLAYPORT pInterface, uint32_t cx,
+                                       uint32_t cy, uint32_t cBPP,
+                                       uint32_t cDisplay, uint32_t dx,
+                                       uint32_t dy, uint32_t fEnabled,
+                                       uint32_t fNotifyGuest);
 
 # ifdef VBOX_WITH_VDMA

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

@@ -83 +83 @@
     VBVAMOUSESHAPEINFO mouseShapeInfo;
     bool fPaused;
+    VBVAMODEHINT aModeHints[VBOX_VIDEO_MAX_SCREENS];
 } VBVACONTEXT;
 
@@ -495 +496 @@
         pVBVA->hostFlags.u32HostEvents = 0;
         pVBVA->hostFlags.u32SupportedOrders = 0;
+        pVGAState->fGuestCaps = 0;
+        pVGAState->pDrv->pfnVBVAGuestCapabilityUpdate(pVGAState->pDrv, 0);
 
         rc = pVGAState->pDrv->pfnVBVAEnable (pVGAState->pDrv, uScreenId, &pVBVA->hostFlags, false);
@@ -1599 +1602 @@
             AssertRCReturn(rc, rc);
 #endif
+            rc = SSMR3PutU32 (pSSM, RT_ELEMENTS(pCtx->aModeHints));
+            AssertRCReturn(rc, rc);
+            rc = SSMR3PutU32 (pSSM, sizeof(VBVAMODEHINT));
+            AssertRCReturn(rc, rc);
+            for (unsigned i = 0; i < RT_ELEMENTS(pCtx->aModeHints); ++i)
+            {
+                rc = SSMR3PutMem (pSSM, pCtx->aModeHints[i],
+                                  sizeof(VBVAMODEHINT));
+                AssertRCReturn(rc, rc);
+            }
         }
     }
@@ -2146 +2159 @@
                 pConf32->u32Value = 64*_1K;
             }
+            else if (pConf32->u32Index == VBOX_VBVA_CONF32_MODE_HINT_REPORTING)
+            {
+                pConf32->u32Value = VINF_SUCCESS;
+            }
             else
             {
@@ -2397 +2414 @@
             VBVACAPS *pCaps = (VBVACAPS*)pvBuffer;
             pVGAState->fGuestCaps = pCaps->fCaps;
+            pVGAState->pDrv->pfnVBVAGuestCapabilityUpdate(pVGAState->pDrv,
+                                                          pCaps->fCaps);
             pCaps->rc = VINF_SUCCESS;
         } break;
@@ -2412 +2431 @@
             pCfg->rc = VINF_SUCCESS;
         } break;
+
+        case VBVA_QUERY_MODE_HINTS:
+        {
+            if (cbBuffer < sizeof(VBVAQUERYMODEHINTS))
+            {
+                rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+            VBVAQUERYMODEHINTS *pModeHintQuery = (VBVAQUERYMODEHINTS*)pvBuffer;
+            LogRelFlowFunc(("VBVA_QUERY_MODE_HINTS: cHintsQueried=%u, cbHintStructureGuest=%u\n",
+                            (unsigned)pModeHintQuery->cHintsQueried,
+                            (unsigned)pModeHintQuery->cbHintStructureGuest));
+            if (cbBuffer <   sizeof (VBVAQUERYMODEHINTS)
+                           +   (uint64_t)pModeHintQuery->cHintsQueried
+                             * pModeHintQuery->cbHintStructureGuest)
+            {
+                pModeHintQuery->rc = VERR_INVALID_PARAMETER;
+                break;
+            }
+            pModeHintQuery->rc = VINF_SUCCESS;
+            uint8_t *pbHint = (uint8_t *)pvBuffer + sizeof(VBVAQUERYMODEHINTS);
+            memset(pbHint, ~0, cbBuffer - sizeof(VBVAQUERYMODEHINTS));
+            unsigned iHint;
+            for (iHint = 0; iHint < pModeHintQuery->cHintsQueried && iHint < 64;
+                 ++iHint)
+            {
+                memcpy(pbHint, &pCtx->aModeHints[iHint],
+                       RT_MIN(pModeHintQuery->cbHintStructureGuest,
+                              sizeof(VBVAMODEHINT)));
+                pbHint += pModeHintQuery->cbHintStructureGuest;
+                Assert(pbHint - (uint8_t *)pvBuffer <= cbBuffer);
+            }
+        } break;
+
         default:
             Log(("Unsupported VBVA guest command %d!!!\n",
@@ -2502 +2555 @@
     }
 
+    return rc;
+}
+
+static int vbvaSendModeHintWorker(PVGASTATE pThis, uint32_t cx, uint32_t cy,
+                                  uint32_t cBPP, uint32_t iDisplay, uint32_t dx,
+                                  uint32_t dy, uint32_t fEnabled,
+                                  uint32_t fNotifyGuest)
+{
+    VBVACONTEXT *pCtx = (VBVACONTEXT *)HGSMIContext(pThis->pHGSMI);
+    /** @note See Display::setVideoModeHint: "It is up to the guest to decide
+     *  whether the hint is valid. Therefore don't do any VRAM sanity checks
+     *  here! */
+    if (iDisplay > RT_MIN(pThis->cMonitors, RT_ELEMENTS(pCtx->aModeHints)))
+        return VERR_OUT_OF_RANGE;
+    pCtx->aModeHints[iDisplay].magic    = VBVAMODEHINT_MAGIC;
+    pCtx->aModeHints[iDisplay].cx       = cx;
+    pCtx->aModeHints[iDisplay].cy       = cy;
+    pCtx->aModeHints[iDisplay].cBPP     = cBPP;
+    pCtx->aModeHints[iDisplay].dx       = dx;
+    pCtx->aModeHints[iDisplay].dy       = dy;
+    pCtx->aModeHints[iDisplay].fEnabled = fEnabled;
+    if (fNotifyGuest && pThis->fGuestCaps & VBVACAPS_IRQ)
+        VBVARaiseIrq(pThis, HGSMIHOSTFLAGS_HOTPLUG);
+    return VINF_SUCCESS;
+}
+
+/** Converts a display port interface pointer to a vga state pointer. */
+#define IDISPLAYPORT_2_VGASTATE(pInterface) ( (PVGASTATE)((uintptr_t)pInterface - RT_OFFSETOF(VGASTATE, IPort)) )
+
+DECLCALLBACK(int) vbvaPortSendModeHint(PPDMIDISPLAYPORT pInterface, uint32_t cx,
+                                       uint32_t cy, uint32_t cBPP,
+                                       uint32_t iDisplay, uint32_t dx,
+                                       uint32_t dy, uint32_t fEnabled,
+                                       uint32_t fNotifyGuest)
+{
+    PVGASTATE pThis;
+    int rc;
+
+    pThis = IDISPLAYPORT_2_VGASTATE(pInterface);
+    rc = PDMCritSectEnter(&pThis->CritSect, VERR_SEM_BUSY);
+    AssertRC(rc);
+    rc = vbvaSendModeHintWorker(pThis, cx, cy, cBPP, iDisplay, dx, dy, fEnabled,
+                                fNotifyGuest);
+    PDMCritSectLeave(&pThis->CritSect);
     return rc;
 }
@@ -2535 +2632 @@
              pCtx->cViews = pVGAState->cMonitors;
              pCtx->fPaused = true;
+             memset(pCtx->aModeHints, ~0, sizeof(*pCtx->aModeHints));
          }
      }

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -854 +854 @@
 
 /**
+ * Send an ACPI monitor hot-plug event.
+ *
+ * @returns VBox status code
+ * @param   pInterface      Pointer to the interface structure containing the
+ *                          called function pointer.
+ */
+static DECLCALLBACK(int) acpiR3Port_MonitorHotPlugEvent(PPDMIACPIPORT pInterface)
+{
+    ACPIState *pThis = RT_FROM_MEMBER(pInterface, ACPIState, IACPIPort);
+    DEVACPI_LOCK_R3(pThis);
+
+    apicR3UpdateGpe0(pThis, pThis->gpe0_sts | 0x4, pThis->gpe0_en);
+
+    DEVACPI_UNLOCK(pThis);
+    return VINF_SUCCESS;
+}
+
+/**
  * Used by acpiR3PmTimer to re-arm the PM timer.
  *
@@ -2989 +3007 @@
     pThis->IACPIPort.pfnGetGuestEnteredACPIMode = acpiR3Port_GetGuestEnteredACPIMode;
     pThis->IACPIPort.pfnGetCpuStatus            = acpiR3Port_GetCpuStatus;
+    pThis->IACPIPort.pfnMonitorHotPlugEvent     = acpiR3Port_MonitorHotPlugEvent;
 
     /*

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -910 +910 @@
             }
 
+            // Graphics device
+            Device (GFX0)
+            {
+                Name (_ADR, 0x00020000)
+
+                Scope (\_GPE)
+                {
+                    // GPE bit 2 handler
+                    // GPE.2 must be set and SCI raised when
+                    // display information changes.
+                    Method (_L02, 0, NotSerialized)
+                    {
+                            Notify (\_SB.PCI0.GFX0, 0x81)
+                    }
+                }
+
+                Method (_DOD, 0, NotSerialized)
+                {
+                    Return (Package()
+                    {
+                        0x80000100
+                    })
+                }
+
+                Device (VGA)
+                {
+                    Method (_ADR, 0, Serialized)
+                    {
+                        Return (0x0100)
+                    }
+                }
+            }
+
             // HDA Audio card
             Device (HDEF)

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -250 +250 @@
     HRESULT i_onShowWindow(BOOL aCheck, BOOL *aCanShow, LONG64 *aWinId);
     void i_onVRDEServerInfoChange();
+    HRESULT i_sendACPIMonitorHotPlugEvent();
 
     static const PDMDRVREG DrvStatusReg;

trunk/src/VBox/Main/include/DisplayImpl.h

@@ -148 +148 @@
                                uint32_t w, uint32_t h, uint16_t flags);
     void i_handleDisplayUpdate(unsigned uScreenId, int x, int y, int w, int h);
+    void i_handleUpdateVMMDevSupportsGraphics(bool fSupportsGraphics);
+    void i_handleUpdateGuestVBVACapabilities(uint32_t fNewCapabilities);
 #ifdef VBOX_WITH_VIDEOHWACCEL
     int  i_handleVHWACommandProcess(PVBOXVHWACMD pCommand);
@@ -327 +329 @@
                                                               uint32_t xHot, uint32_t yHot, uint32_t cx, uint32_t cy,
                                                               const void *pvShape);
+    static DECLCALLBACK(void)  i_displayVBVAGuestCapabilityUpdate(PPDMIDISPLAYCONNECTOR pInterface, uint32_t fCapabilities);
 #endif
 
@@ -357 +360 @@
     unsigned mcMonitors;
     DISPLAYFBINFO maFramebuffers[SchemaDefs::MaxGuestMonitors];
+    /** Does the VMM device have the "supports graphics" capability set?
+     *  Does not go into the saved state as it is refreshed on restore. */
+    bool        mfVMMDevSupportsGraphics;
+    /** Mirror of the current guest VBVA capabilities.
+     *  Does not go into the saved state as it is refreshed on restore. */
+    uint32_t    mfGuestVBVACapabilities;
 
     bool mfSourceBitmapEnabled;
@@ -426 +435 @@
     static int i_drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height);
 
+    void i_updateGuestGraphicsFacility(void);
+
 #if defined(VBOX_WITH_HGCM) && defined(VBOX_WITH_CROGL)
     int i_crOglWindowsShow(bool fShow);

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -5184 +5184 @@
 
     fireVRDEServerInfoChangedEvent(mEventSource);
+}
+
+HRESULT Console::i_sendACPIMonitorHotPlugEvent()
+{
+    LogFlowThisFuncEnter();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (   mMachineState != MachineState_Running
+        && mMachineState != MachineState_Teleporting
+        && mMachineState != MachineState_LiveSnapshotting)
+        return i_setInvalidMachineStateError();
+
+    /* get the VM handle. */
+    SafeVMPtr ptrVM(this);
+    if (!ptrVM.isOk())
+        return ptrVM.rc();
+
+    // no need to release lock, as there are no cross-thread callbacks
+
+    /* get the acpi device interface and press the sleep button. */
+    PPDMIBASE pBase;
+    int vrc = PDMR3QueryDeviceLun(ptrVM.rawUVM(), "acpi", 0, 0, &pBase);
+    if (RT_SUCCESS(vrc))
+    {
+        Assert(pBase);
+        PPDMIACPIPORT pPort = PDMIBASE_QUERY_INTERFACE(pBase, PDMIACPIPORT);
+        if (pPort)
+            vrc = pPort->pfnMonitorHotPlugEvent(pPort);
+        else
+            vrc = VERR_PDM_MISSING_INTERFACE;
+    }
+
+    HRESULT rc = RT_SUCCESS(vrc) ? S_OK :
+        setError(VBOX_E_PDM_ERROR,
+            tr("Sending monitor hot-plug event failed (%Rrc)"),
+            vrc);
+
+    LogFlowThisFunc(("rc=%Rhrc\n", rc));
+    LogFlowThisFuncLeave();
+    return rc;
 }
 

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -20 +20 @@
 #include "ConsoleImpl.h"
 #include "ConsoleVRDPServer.h"
+#include "GuestImpl.h"
 #include "VMMDev.h"
 
@@ -122 +123 @@
 #ifdef VBOX_WITH_HGSMI
     mu32UpdateVBVAFlags = 0;
+    mfVMMDevSupportsGraphics = false;
+    mfGuestVBVACapabilities = 0;
 #endif
 #ifdef VBOX_WITH_VPX
@@ -1032 +1035 @@
         mParent->i_consoleVRDPServer()->SendUpdateBitmap(uScreenId, x, y, w, h);
     }
+}
+
+void Display::i_updateGuestGraphicsFacility(void)
+{
+    Guest* pGuest = mParent->i_getGuest();
+    AssertPtrReturnVoid(pGuest);
+    /* The following is from GuestImpl.cpp. */
+    /** @todo A nit: The timestamp is wrong on saved state restore. Would be better
+     *  to move the graphics and seamless capability -> facility translation to
+     *  VMMDev so this could be saved.  */
+    RTTIMESPEC TimeSpecTS;
+    RTTimeNow(&TimeSpecTS);
+
+    if (   mfVMMDevSupportsGraphics
+        || (mfGuestVBVACapabilities & VBVACAPS_VIDEO_MODE_HINTS) != 0)
+        pGuest->i_setAdditionsStatus(VBoxGuestFacilityType_Graphics,
+                                     VBoxGuestFacilityStatus_Active,
+                                     0 /*fFlags*/, &TimeSpecTS);
+    else
+        pGuest->i_setAdditionsStatus(VBoxGuestFacilityType_Graphics,
+                                     VBoxGuestFacilityStatus_Inactive,
+                                     0 /*fFlags*/, &TimeSpecTS);
+}
+
+void Display::i_handleUpdateVMMDevSupportsGraphics(bool fSupportsGraphics)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (mfVMMDevSupportsGraphics == fSupportsGraphics)
+        return;
+    mfVMMDevSupportsGraphics = fSupportsGraphics;
+    i_updateGuestGraphicsFacility();
+    /* The VMMDev interface notifies the console. */
+}
+
+void Display::i_handleUpdateGuestVBVACapabilities(uint32_t fNewCapabilities)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    bool fNotify = (fNewCapabilities & VBVACAPS_VIDEO_MODE_HINTS) != 0;
+
+    mfGuestVBVACapabilities = fNewCapabilities;
+    if (!fNotify)
+        return;
+    i_updateGuestGraphicsFacility();
+    /* Tell the console about it */
+    mParent->i_onAdditionsStateChange();
 }
 
@@ -1637 +1685 @@
     alock.release();
 
+    /* We always send the hint to the graphics card in case the guest enables
+     * support later.  For now we notify exactly when support is enabled. */
+    mpDrv->pUpPort->pfnSendModeHint(mpDrv->pUpPort, aWidth, aHeight,
+                                    aBitsPerPixel, aDisplay,
+                                    aChangeOrigin ? aOriginX : ~0,
+                                    aChangeOrigin ? aOriginY : ~0,
+                                    RT_BOOL(aEnabled),
+                                      mfGuestVBVACapabilities
+                                    & VBVACAPS_VIDEO_MODE_HINTS);
+    if (   mfGuestVBVACapabilities & VBVACAPS_VIDEO_MODE_HINTS
+        && !(mfGuestVBVACapabilities & VBVACAPS_IRQ))
+    {
+        HRESULT hrc = mParent->i_sendACPIMonitorHotPlugEvent();
+        if (FAILED(hrc))
+            return hrc;
+    }
+
+    /* We currently never suppress the VMMDev hint if the guest has requested
+     * it.  Specifically the video graphics driver may not be responsible for
+     * screen positioning in the guest virtual desktop, and the component
+     * responsible may want to get the hint from VMMDev. */
     VMMDev *pVMMDev = mParent->i_getVMMDev();
     if (pVMMDev)
@@ -3781 +3850 @@
     return VINF_SUCCESS;
 }
+
+DECLCALLBACK(void) Display::i_displayVBVAGuestCapabilityUpdate(PPDMIDISPLAYCONNECTOR pInterface, uint32_t fCapabilities)
+{
+    LogFlowFunc(("\n"));
+
+    PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
+    Display *pThis = pDrv->pDisplay;
+
+    pThis->i_handleUpdateGuestVBVACapabilities(fCapabilities);
+}
 #endif /* VBOX_WITH_HGSMI */
 
@@ -3881 +3960 @@
     pThis->IConnector.pfnVBVAResize            = Display::i_displayVBVAResize;
     pThis->IConnector.pfnVBVAMousePointerShape = Display::i_displayVBVAMousePointerShape;
+    pThis->IConnector.pfnVBVAGuestCapabilityUpdate = Display::i_displayVBVAGuestCapabilityUpdate;
 #endif
 

trunk/src/VBox/Main/src-client/GuestImpl.cpp

@@ -1083 +1083 @@
                      0 /*fFlags*/, &TimeSpecTS);
     /** @todo Add VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING */
-    i_facilityUpdate(VBoxGuestFacilityType_Graphics,
-                     aCaps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? VBoxGuestFacilityStatus_Active : VBoxGuestFacilityStatus_Inactive,
-                     0 /*fFlags*/, &TimeSpecTS);
-}
-
+}
+

trunk/src/VBox/Main/src-client/VMMDevInterface.cpp

@@ -290 +290 @@
      */
     pGuest->i_setSupportedFeatures(newCapabilities);
+
+    /*
+     * Tell the Display, so that it can update the "supports graphics"
+     * capability if the graphics card has not asserted it.
+     */
+    Display* pDisplay = pConsole->i_getDisplay();
+    AssertPtrReturnVoid(pDisplay);
+    pDisplay->i_handleUpdateVMMDevSupportsGraphics(newCapabilities
+                                             & VMMDEV_GUEST_SUPPORTS_GRAPHICS);
 
     /*