Changeset 51217 in vbox

Timestamp:

May 8, 2014 5:42:50 PM (10 years ago)

Author:

vboxsync

Message:

crOpenGL: pdm led, some fixes to follow

Location:

trunk

Files:

• include/VBox/VBoxVideoHost3D.h (modified) (2 diffs)
• include/VBox/vmm/pdmifs.h (modified) (4 diffs)
• src/VBox/Devices/Graphics/DevVGA.cpp (modified) (3 diffs)
• src/VBox/Devices/Graphics/DevVGA.h (modified) (2 diffs)
• src/VBox/Devices/Graphics/DevVGA_VDMA.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server.h (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (1 diff)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
• src/VBox/Main/include/ConsoleImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (2 diffs)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (1 diff)

trunk/include/VBox/VBoxVideoHost3D.h

@@ -29 +29 @@
 #include <VBox/VBoxVideo.h>
 #include <VBox/hgcmsvc.h>
+#include <VBox/vmm/pdmifs.h>
 
 /* screen update instance */
@@ -95 +96 @@
     };
     uint64_t cbVRam;
+    PPDMLED pLed;
     /* out */
     struct VBOXCRCMD_SVRINFO CrCmdServerInfo;

trunk/include/VBox/vmm/pdmifs.h

@@ -641 +641 @@
 typedef struct VBVAINFOVIEW *PVBVAINFOVIEW;
 typedef struct VBVAHOSTFLAGS *PVBVAHOSTFLAGS;
-typedef struct VBOXVDMACMD_CHROMIUM_CMD *PVBOXVDMACMD_CHROMIUM_CMD; /* <- chromium [hgsmi] command */
-typedef struct VBOXVDMACMD_CHROMIUM_CTL *PVBOXVDMACMD_CHROMIUM_CTL; /* <- chromium [hgsmi] command */
+struct VBOXVDMACMD_CHROMIUM_CMD; /* <- chromium [hgsmi] command */
+struct VBOXVDMACMD_CHROMIUM_CTL; /* <- chromium [hgsmi] command */
 
 
@@ -766 +766 @@
      * @thread  The emulation thread.
      */
-    DECLR3CALLBACKMEMBER(void, pfnCrHgsmiCommandProcess, (PPDMIDISPLAYCONNECTOR pInterface, PVBOXVDMACMD_CHROMIUM_CMD pCmd, uint32_t cbCmd));
+    DECLR3CALLBACKMEMBER(void, pfnCrHgsmiCommandProcess, (PPDMIDISPLAYCONNECTOR pInterface, struct VBOXVDMACMD_CHROMIUM_CMD* pCmd, uint32_t cbCmd));
 
     /**
@@ -775 +775 @@
      * @thread  The emulation thread.
      */
-    DECLR3CALLBACKMEMBER(void, pfnCrHgsmiControlProcess, (PPDMIDISPLAYCONNECTOR pInterface, PVBOXVDMACMD_CHROMIUM_CTL pCtl, uint32_t cbCtl));
+    DECLR3CALLBACKMEMBER(void, pfnCrHgsmiControlProcess, (PPDMIDISPLAYCONNECTOR pInterface, struct VBOXVDMACMD_CHROMIUM_CTL* pCtl, uint32_t cbCtl));
 
     /**
@@ -3090 +3090 @@
 
     DECLR3CALLBACKMEMBER(int, pfnCrHgsmiCommandCompleteAsync, (PPDMIDISPLAYVBVACALLBACKS pInterface,
-                                                               PVBOXVDMACMD_CHROMIUM_CMD pCmd, int rc));
+                                                               struct VBOXVDMACMD_CHROMIUM_CMD* pCmd, int rc));
 
     DECLR3CALLBACKMEMBER(int, pfnCrHgsmiControlCompleteAsync, (PPDMIDISPLAYVBVACALLBACKS pInterface,
-                                                               PVBOXVDMACMD_CHROMIUM_CTL pCmd, int rc));
+                                                               struct VBOXVDMACMD_CHROMIUM_CTL* pCmd, int rc));
 
     DECLR3CALLBACKMEMBER(int, pfnCrCtlSubmit, (PPDMIDISPLAYVBVACALLBACKS pInterface,

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

@@ -4461 +4461 @@
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIDISPLAYVBVACALLBACKS, &pThis->IVBVACallbacks);
 #endif
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMILEDPORTS, &pThis->ILeds);
     return NULL;
 }
 
+/* -=-=-=-=-=- Ring 3: ILeds -=-=-=-=-=- */
+#define ILEDPORTS_2_VGASTATE(pInterface) ( (PVGASTATE)((uintptr_t)pInterface - RT_OFFSETOF(VGASTATE, ILeds)) )
+
+/**
+ * Gets the pointer to the status LED of a unit.
+ *
+ * @returns VBox status code.
+ * @param   pInterface      Pointer to the interface structure containing the called function pointer.
+ * @param   iLUN            The unit which status LED we desire.
+ * @param   ppLed           Where to store the LED pointer.
+ */
+static DECLCALLBACK(int) vgaPortQueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
+{
+    PVGASTATE pThis = ILEDPORTS_2_VGASTATE(pInterface);
+    switch (iLUN)
+    {
+        /* LUN #0: Display port. */
+        case 0:
+        {
+            *ppLed = &pThis->Led3D;
+            Assert((*ppLed)->u32Magic == PDMLED_MAGIC);
+            return VINF_SUCCESS;
+        }
+
+        default:
+            AssertMsgFailed(("Invalid LUN #%d\n", iLUN));
+            return VERR_PDM_NO_SUCH_LUN;
+    }
+
+    return VERR_PDM_LUN_NOT_FOUND;
+}
 
 /* -=-=-=-=-=- Ring 3: Dummy IDisplayConnector -=-=-=-=-=- */
@@ -5993 +6025 @@
 # endif
 #endif
+
+    pThis->ILeds.pfnQueryStatusLed = vgaPortQueryStatusLed;
+
+    RT_ZERO(pThis->Led3D);
+    pThis->Led3D.u32Magic = PDMLED_MAGIC;
+
     /*
      * We use our own critical section to avoid unncessary pointer indirections
@@ -6753 +6791 @@
     /* Init latched access mask. */
     pThis->uMaskLatchAccess = 0x3ff;
+
+    if (RT_SUCCESS(rc))
+    {
+        PPDMIBASE  pBase;
+        /*
+         * Attach status driver (optional).
+         */
+        rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pThis->IBase, &pBase, "Status Port");
+        AssertRC(rc);
+        if (RT_SUCCESS(rc))
+        {
+            pThis->pLedsConnector = PDMIBASE_QUERY_INTERFACE(pBase, PDMILEDCONNECTORS);
+            pThis->pMediaNotify = PDMIBASE_QUERY_INTERFACE(pBase, PDMIMEDIANOTIFY);
+        }
+        else if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
+        {
+            AssertMsgFailed(("Failed to attach to status driver. rc=%Rrc\n", rc));
+            return PDMDEV_SET_ERROR(pDevIns, rc, N_("AHCI cannot attach to status driver"));
+        }
+    }
     return rc;
 }

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

@@ -294 +294 @@
     PDMIDISPLAYVBVACALLBACKS    IVBVACallbacks;
 # endif
+    /** Status LUN\#0: Leds interface. */
+    PDMILEDPORTS                ILeds;
     /** Pointer to base interface of the driver. */
     R3PTRTYPE(PPDMIBASE)        pDrvBase;
     /** Pointer to display connector interface of the driver. */
     R3PTRTYPE(PPDMIDISPLAYCONNECTOR) pDrv;
+
+    /** Status LUN: Partner of ILeds. */
+    R3PTRTYPE(PPDMILEDCONNECTORS)   pLedsConnector;
+    /** Status LUN: Media Notifys. */
+    R3PTRTYPE(PPDMIMEDIANOTIFY)     pMediaNotify;
 
     /** Refresh timer handle - HC. */
@@ -516 +523 @@
 # endif /* VBOX_WITH_HGSMI */
 
+    PDMLED Led3D;
+
     struct {
         volatile uint32_t cPending;

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

@@ -1944 +1944 @@
         pCmd->pvVRamBase = pVGAState->vram_ptrR3;
         pCmd->cbVRam = pVGAState->vram_size;
+        pCmd->pLed = &pVGAState->Led3D;
         rc = vboxVDMACrCtlPost(pVGAState, &pCmd->Hdr, sizeof (*pCmd));
         if (RT_SUCCESS(rc))

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -27 +27 @@
 extern uint8_t* g_pvVRamBase;
 extern uint32_t g_cbVRam;
+extern PPDMLED g_pLed;
 extern HCRHGSMICMDCOMPLETION g_hCrHgsmiCompletion;
 extern PFNCRHGSMICMDCOMPLETION g_pfnCrHgsmiCompletion;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -38 +38 @@
 uint8_t* g_pvVRamBase = NULL;
 uint32_t g_cbVRam = 0;
+PPDMLED g_pLed = NULL;
+
 HCRHGSMICMDCOMPLETION g_hCrHgsmiCompletion = NULL;
 PFNCRHGSMICMDCOMPLETION g_pfnCrHgsmiCompletion = NULL;
@@ -4211 +4213 @@
             g_pvVRamBase = (uint8_t*)pSetup->pvVRamBase;
             g_cbVRam = pSetup->cbVRam;
+
+            g_pLed = pSetup->pLed;
+
             pSetup->CrCmdServerInfo.hSvr = NULL;
             pSetup->CrCmdServerInfo.pfnEnable = crVBoxCrCmdEnable;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -2489 +2489 @@
                 mFlags.fForcePresentOnReenable = false;
                 cr_server.head_spu->dispatch_table.VBoxPresentComposition(mSpuWindow, mpCompositor, NULL);
+                g_pLed->Asserted.s.fWriting = 1;
             }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -1113 +1113 @@
   <enum
     name="DeviceType"
-    uuid="6d9420f7-0b56-4636-99f9-7346f1b01e57"
+    uuid="cb977be1-d1fb-41f8-ad7e-951736c6cb3e"
     >
     <desc>
@@ -1142 +1142 @@
       <desc>Shared folder device.</desc>
     </const>
-  </enum>
+    <const name="Graphics"          value="7">
+      <desc>Graphics device.</desc>
+    </const>  </enum>
 
   <enum

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

@@ -893 +893 @@
     PPDMLED      mapSharedFolderLed;
     PPDMLED      mapUSBLed[2];
+    PPDMLED      mapCrOglLed;
 
     MediumAttachmentMap mapMediumAttachments;

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

@@ -433 +433 @@
     RT_ZERO(mapUSBLed);
     RT_ZERO(mapSharedFolderLed);
+    RT_ZERO(mapCrOglLed);
 
     for (unsigned i = 0; i < RT_ELEMENTS(maStorageDevType); ++i)
@@ -2877 +2878 @@
         {
             SumLed.u32 |= readAndClearLed(mapSharedFolderLed);
+            break;
+        }
+
+        case DeviceType_Graphics:
+        {
+            SumLed.u32 |= readAndClearLed(mapCrOglLed);
             break;
         }

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

@@ -3399 +3399 @@
 #endif
 
+        attachStatusDriver(pInst, &mapCrOglLed, 0, 0, NULL, NULL, 0);
+
 #ifdef VBOX_WITH_VMSVGA
         if (graphicsController == GraphicsControllerType_VMSVGA)