Changeset 32823 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.h

Timestamp:

Sep 29, 2010 4:50:53 PM (14 years ago)

Author:

vboxsync

Message:

wddm/2d: 2D video accel support fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.h (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.h

@@ -14 +14 @@
 
 #include <iprt/cdefs.h>
+#include <iprt/asm.h>
 #include <VBox/VBoxVideo.h>
 #include "../VBoxVideo.h"
+
+/* ddi dma command queue handling */
+typedef enum
+{
+    VBOXVDMADDI_STATE_UNCKNOWN = 0,
+    VBOXVDMADDI_STATE_NOT_QUEUED,
+    VBOXVDMADDI_STATE_PENDING,
+    VBOXVDMADDI_STATE_SUBMITTED,
+    VBOXVDMADDI_STATE_COMPLETED
+} VBOXVDMADDI_STATE;
+
+typedef struct VBOXVDMADDI_CMD *PVBOXVDMADDI_CMD;
+typedef DECLCALLBACK(VOID) FNVBOXVDMADDICMDCOMPLETE_DPC(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext);
+typedef FNVBOXVDMADDICMDCOMPLETE_DPC *PFNVBOXVDMADDICMDCOMPLETE_DPC;
+
+typedef struct VBOXVDMADDI_CMD
+{
+    LIST_ENTRY QueueEntry;
+    VBOXVDMADDI_STATE enmState;
+    uint32_t u32FenceId;
+    PVBOXWDDM_CONTEXT pContext;
+    PFNVBOXVDMADDICMDCOMPLETE_DPC pfnComplete;
+    PVOID pvComplete;
+} VBOXVDMADDI_CMD, *PVBOXVDMADDI_CMD;
+
+typedef struct VBOXVDMADDI_CMD_QUEUE
+{
+    volatile uint32_t cQueuedCmds;
+    LIST_ENTRY CmdQueue;
+    LIST_ENTRY DpcCmdQueue;
+} VBOXVDMADDI_CMD_QUEUE, *PVBOXVDMADDI_CMD_QUEUE;
+
+VOID vboxVdmaDdiQueueInit(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD_QUEUE pQueue);
+BOOLEAN vboxVdmaDdiCmdCompletedIrq(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD_QUEUE pQueue, PVBOXVDMADDI_CMD pCmd);
+VOID vboxVdmaDdiCmdSubmittedIrq(PVBOXVDMADDI_CMD_QUEUE pQueue, PVBOXVDMADDI_CMD pCmd);
+
+NTSTATUS vboxVdmaDdiCmdCompleted(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD_QUEUE pQueue, PVBOXVDMADDI_CMD pCmd);
+NTSTATUS vboxVdmaDdiCmdSubmitted(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD_QUEUE pQueue, PVBOXVDMADDI_CMD pCmd);
+
+DECLINLINE(VOID) vboxVdmaDdiCmdInit(PVBOXVDMADDI_CMD pCmd,
+        uint32_t u32FenceId, PVBOXWDDM_CONTEXT pContext,
+        PFNVBOXVDMADDICMDCOMPLETE_DPC pfnComplete, PVOID pvComplete)
+{
+    pCmd->QueueEntry.Blink = NULL;
+    pCmd->QueueEntry.Flink = NULL;
+    pCmd->enmState = VBOXVDMADDI_STATE_NOT_QUEUED;
+    pCmd->u32FenceId = u32FenceId;
+    pCmd->pContext = pContext;
+    pCmd->pfnComplete = pfnComplete;
+    pCmd->pvComplete = pvComplete;
+}
+
+NTSTATUS vboxVdmaDdiCmdFenceComplete(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_CONTEXT pContext, uint32_t u32FenceId);
+
+DECLCALLBACK(VOID) vboxVdmaDdiCmdCompletionCbFree(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext);
+
+DECLINLINE(VOID) vboxVdmaDdiCmdGetCompletedListIsr(PVBOXVDMADDI_CMD_QUEUE pQueue, LIST_ENTRY *pList)
+{
+    vboxVideoLeDetach(&pQueue->DpcCmdQueue, pList);
+}
+
+#define VBOXVDMADDI_CMD_FROM_ENTRY(_pEntry) ((PVBOXVDMADDI_CMD)(((uint8_t*)(_pEntry)) - RT_OFFSETOF(VBOXVDMADDI_CMD, QueueEntry)))
+
+DECLINLINE(VOID) vboxVdmaDdiCmdHandleCompletedList(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD_QUEUE pQueue, LIST_ENTRY *pList)
+{
+    LIST_ENTRY *pEntry = pList->Flink;
+    while (pEntry != pList)
+    {
+        PVBOXVDMADDI_CMD pCmd = VBOXVDMADDI_CMD_FROM_ENTRY(pEntry);
+        pEntry = pEntry->Flink;
+        if (pCmd->pfnComplete)
+            pCmd->pfnComplete(pDevExt, pCmd, pCmd->pvComplete);
+    }
+}
+
+#ifdef VBOXWDDM_RENDER_FROM_SHADOW
+NTSTATUS vboxVdmaHlpUpdatePrimary(PDEVICE_EXTENSION pDevExt, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId, RECT* pRect);
+#endif
 
 #if 0
@@ -57 +136 @@
 {
     VBOXVDMAPIPE_CMD_TYPE_UNDEFINED = 0,
-    VBOXVDMAPIPE_CMD_TYPE_RECTSINFO = 1,
-    VBOXVDMAPIPE_CMD_TYPE_DMACMD_CLRFILL    = 2
+    VBOXVDMAPIPE_CMD_TYPE_RECTSINFO,
+    VBOXVDMAPIPE_CMD_TYPE_DMACMD
 } VBOXVDMAPIPE_CMD_TYPE;
 
@@ -69 +148 @@
 #define VBOXVDMAPIPE_CMD_DR_FROM_ENTRY(_pE)  ( (PVBOXVDMAPIPE_CMD_DR)VBOXVDMAPIPE_CMD_HDR_FROM_ENTRY(_pE) )
 
+typedef struct VBOXWDDM_DMA_ALLOCINFO
+{
+    PVBOXWDDM_ALLOCATION pAlloc;
+    VBOXVIDEOOFFSET offAlloc;
+    UINT segmentIdAlloc;
+    D3DDDI_VIDEO_PRESENT_SOURCE_ID srcId;
+} VBOXWDDM_DMA_ALLOCINFO, *PVBOXWDDM_DMA_ALLOCINFO;
+
 typedef struct VBOXVDMAPIPE_RECTS
 {
@@ -78 +165 @@
 {
     VBOXVDMAPIPE_CMD_DR Hdr;
-    struct VBOXWDDM_CONTEXT *pContext;
+    VBOXVDMADDI_CMD DdiCmd;
     struct VBOXWDDM_SWAPCHAIN *pSwapchain;
     VBOXVDMAPIPE_RECTS ContextsRects;
 } VBOXVDMAPIPE_CMD_RECTSINFO, *PVBOXVDMAPIPE_CMD_RECTSINFO;
 
-typedef struct VBOXVDMAPIPE_CMD_DMACMD_CLRFILL
+typedef struct VBOXVDMAPIPE_FLAGS_DMACMD
+{
+    union
+    {
+        struct
+        {
+            UINT b2DRelated     : 1;
+            UINT b3DRelated     : 1;
+            UINT bDecVBVAUnlock : 1;
+            UINT Reserved       : 29;
+        };
+        UINT Value;
+    };
+} VBOXVDMAPIPE_FLAGS_DMACMD, *PVBOXVDMAPIPE_FLAGS_DMACMD;
+typedef struct VBOXVDMAPIPE_CMD_DMACMD
 {
     VBOXVDMAPIPE_CMD_DR Hdr;
-    struct VBOXWDDM_CONTEXT *pContext;
-    struct VBOXWDDM_ALLOCATION *pAllocation;
-    UINT SubmissionFenceId;
-    D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId;
+    VBOXVDMADDI_CMD DdiCmd;
+    PDEVICE_EXTENSION pDevExt;
+    VBOXVDMACMD_TYPE enmCmd;
+    VBOXVDMAPIPE_FLAGS_DMACMD fFlags;
+} VBOXVDMAPIPE_CMD_DMACMD, *PVBOXVDMAPIPE_CMD_DMACMD;
+
+typedef struct VBOXVDMA_CLRFILL
+{
+    VBOXWDDM_DMA_ALLOCINFO Alloc;
     UINT Color;
     VBOXWDDM_RECTS_INFO Rects;
+} VBOXVDMA_CLRFILL, *PVBOXVDMA_CLRFILL;
+
+typedef struct VBOXVDMAPIPE_CMD_DMACMD_CLRFILL
+{
+    VBOXVDMAPIPE_CMD_DMACMD Hdr;
+    VBOXVDMA_CLRFILL ClrFill;
 } VBOXVDMAPIPE_CMD_DMACMD_CLRFILL, *PVBOXVDMAPIPE_CMD_DMACMD_CLRFILL;
+
+typedef struct VBOXVDMA_BLT
+{
+    VBOXWDDM_DMA_ALLOCINFO SrcAlloc;
+    VBOXWDDM_DMA_ALLOCINFO DstAlloc;
+    RECT SrcRect;
+    VBOXVDMAPIPE_RECTS DstRects;
+} VBOXVDMA_BLT, *PVBOXVDMA_BLT;
+
+typedef struct VBOXVDMAPIPE_CMD_DMACMD_BLT
+{
+    VBOXVDMAPIPE_CMD_DMACMD Hdr;
+    VBOXVDMA_BLT Blt;
+} VBOXVDMAPIPE_CMD_DMACMD_BLT, *PVBOXVDMAPIPE_CMD_DMACMD_BLT;
+
+typedef struct VBOXVDMA_FLIP
+{
+    VBOXWDDM_DMA_ALLOCINFO Alloc;
+} VBOXVDMA_FLIP, *PVBOXVDMA_FLIP;
+
+typedef struct VBOXVDMAPIPE_CMD_DMACMD_FLIP
+{
+    VBOXVDMAPIPE_CMD_DMACMD Hdr;
+    VBOXVDMA_FLIP Flip;
+} VBOXVDMAPIPE_CMD_DMACMD_FLIP, *PVBOXVDMAPIPE_CMD_DMACMD_FLIP;
+
+typedef struct VBOXVDMA_SHADOW2PRIMARY
+{
+    VBOXWDDM_DMA_ALLOCINFO ShadowAlloc;
+    RECT SrcRect;
+    D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId;
+} VBOXVDMA_SHADOW2PRIMARY, *PVBOXVDMA_SHADOW2PRIMARY;
 
 typedef struct VBOXVDMAGG
@@ -141 +285 @@
 void vboxVdmaGgCmdDestroy(PVBOXVDMAPIPE_CMD_DR pDr);
 
+#define VBOXVDMAPIPE_CMD_DR_FROM_DDI_CMD(_pCmd) ((PVBOXVDMAPIPE_CMD_DR)(((uint8_t*)(_pCmd)) - RT_OFFSETOF(VBOXVDMAPIPE_CMD_DR, DdiCmd)))
+DECLCALLBACK(VOID) vboxVdmaGgDdiCmdDestroy(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext);
+
 #endif /* #ifndef ___VBoxVideoVdma_h___ */