Changeset 26969 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Mar 2, 2010 8:28:01 PM (15 years ago)

Author:

vboxsync

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

58266

Message:

wddm: bugfixes + stubs for DMA support in VGA device

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (2 diffs)
• DevVGA.h (modified) (4 diffs)
• DevVGA_VBVA.cpp (modified) (2 diffs)
• DevVGA_VDMA.cpp (added)
• HGSMI/HGSMIHost.cpp (modified) (2 diffs)
• HGSMI/HGSMIHost.h (modified) (1 diff)
• HGSMI/HGSMIHostHlp.h (modified) (1 diff)
• HGSMI/SHGSMIHost.cpp (added)
• HGSMI/SHGSMIHost.h (added)

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

@@ -49 +49 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
+#ifndef VBOX
 /** The default amount of VRAM. */
 #define VGA_VRAM_DEFAULT    (_4M)
@@ -55 +56 @@
 /** The minimum amount of VRAM. */
 #define VGA_VRAM_MIN        (_1M)
+#else
+/* moved to DevVGA.h */
+#endif
 
 /** The size of the VGA GC mapping.

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

@@ -44 +44 @@
  * THE SOFTWARE.
  */
+#ifdef VBOX
+/** The default amount of VRAM. */
+# define VGA_VRAM_DEFAULT    (_4M)
+/** The maximum amount of VRAM. */
+# define VGA_VRAM_MAX        (128 * _1M)
+/** The minimum amount of VRAM. */
+# define VGA_VRAM_MIN        (_1M)
+#endif
 
 #ifdef VBOX_WITH_HGSMI
@@ -252 +260 @@
 #endif /* VBOX */
 
+#ifdef VBOXVDMA
+typedef struct VBOXVDMAHOST *PVBOXVDMAHOST;
+#endif
+
 typedef struct VGAState {
     VGA_STATE_COMMON
@@ -282 +294 @@
     R3PTRTYPE(PHGSMIINSTANCE)   pHGSMI;
 #endif /* VBOX_WITH_HGSMI */
+#ifdef VBOXVDMA
+    R3PTRTYPE(PVBOXVDMAHOST)    pVdma;
+#endif
 
     /** Current refresh timer interval. */
@@ -476 +491 @@
 int vboxVBVALoadStateDone (PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
 
+# ifdef VBOXVDMA
+int vboxVDMAConstruct(PVGASTATE pVGAState, struct VBOXVDMAHOST *pVdma);
+int vboxVDMADestruct(PVGASTATE pVGAState, struct VBOXVDMAHOST *pVdma);
+void vboxVDMAControl(PVGASTATE pVGAState, struct VBOXVDMAHOST *pVdma, PVBOXVDMA_CTL pCmd);
+void vboxVDMACommand(PVGASTATE pVGAState, struct VBOXVDMAHOST *pVdma, PVBOXVDMACBUF_DR pCmd);
+# endif /* VBOXVDMA */
+
 #endif /* VBOX_WITH_HGSMI */
 

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

@@ -34 +34 @@
 #include <iprt/semaphore.h>
 #endif
-
-/** The default amount of VRAM. */
-#define VGA_VRAM_DEFAULT    (_4M)
-/** The maximum amount of VRAM. */
-#define VGA_VRAM_MAX        (128 * _1M)
-/** The minimum amount of VRAM. */
-#define VGA_VRAM_MIN        (_1M)
 
 #include "DevVGA.h"
@@ -1304 +1297 @@
 #ifdef VBOXVDMA
         case VBVA_VDMA_CMD:
-        case VBVA_VDMA_CTL:
+        {
+            PVBOXVDMACBUF_DR pCmd = (PVBOXVDMACBUF_DR)VBoxSHGSMIBufferData ((PVBOXSHGSMIHEADER)pvBuffer);
+            vboxVDMACommand(pVGAState, pVGAState->pVdma, pCmd);
             rc = VINF_SUCCESS;
             break;
+        }
+        case VBVA_VDMA_CTL:
+        {
+            PVBOXVDMA_CTL pCmd = (PVBOXVDMA_CTL)VBoxSHGSMIBufferData ((PVBOXSHGSMIHEADER)pvBuffer);
+            vboxVDMAControl(pVGAState, pVGAState->pVdma, pCmd);
+            rc = VINF_SUCCESS;
+            break;
+        }
 #endif
         case VBVA_QUERY_CONF32:

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -1677 +1677 @@
 
     int rc = hgsmiGuestCompletionFIFOAlloc (pIns, &pEntry);
-
+    AssertRC(rc);
     if (RT_SUCCESS (rc))
     {
@@ -1683 +1683 @@
 
         rc = hgsmiFIFOLock(pIns);
+        AssertRC(rc);
         if (RT_SUCCESS (rc))
         {

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h

@@ -136 +136 @@
 int HGSMIHostSaveStateExec (PHGSMIINSTANCE pIns, PSSMHANDLE pSSM);
 
-#if 0
-/* Submit this buffer to the guest asynchronously. */
-int HGSMIHostBufferProcessAsync (PHGSMIINSTANCE pIns,
-                                 void *pvMem,
-                                 PFNHGSMIBUFFERPROCESSED);
+#ifdef VBOXVDMA
+int HGSMICompleteGuestCommand(PHGSMIINSTANCE pIns, void *pvMem, bool bDoIrq);
 #endif
 

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHostHlp.h

@@ -50 +50 @@
 }
 
+DECLINLINE(bool) hgsmiListIsEmpty (HGSMILIST *pList)
+{
+    return !pList->pHead;
+}
+
 DECLINLINE(void) hgsmiListInit (HGSMILIST *pList)
 {