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

Timestamp:

Aug 3, 2007 7:53:12 PM (17 years ago)

Author:

vboxsync

Message:

Direct draw heap and miniport heap memory reservation for Windows guest additions.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA.cpp (modified) (8 diffs)
• DevVGA.h (modified) (3 diffs)

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

@@ -582 +582 @@
                 break;
           }
-      } else if (s->vbe_index == VBE_DISPI_INDEX_CMONITORS) {
-            val = s->monitor_count;
+      } else if (s->vbe_index == VBE_DISPI_INDEX_VBOX_VIDEO) {
+            switch (s->vbox_video_command)
+            {
+                case VBOX_VIDEO_QUERY_MONITOR_COUNT:
+                    val = s->monitor_count;
+                    break;
+                case VBOX_VIDEO_QUERY_OFFSCREEN_HEAP_SIZE:
+                    val = _1M; /* @todo make configurable */
+                    break;
+            }
+            Log(("VBE: s->vbox_video_command = 0x%x, s->monitor_count = %d read index=0x%x val=0x%x\n", s->monitor_count, s->vbe_index, val));
       } else {
         val = s->vbe_regs[s->vbe_index];
@@ -834 +843 @@
             }
             break;
-        case VBE_DISPI_INDEX_CMONITORS:
+        case VBE_DISPI_INDEX_VBOX_VIDEO:
 #ifdef VBOX
 #ifdef IN_RING3
@@ -850 +859 @@
                 s->pDrv->pfnProcessDisplayData(s->pDrv, s->CTXSUFF(vram_ptr), val & 0xFFFF);
             }
+            s->vbox_video_command = val;
 #endif /* IN_RING3 */
 #endif /* VBOX */
@@ -2755 +2765 @@
      */
     if (s->vbe_index == VBE_DISPI_INDEX_ENABLE
-        || s->vbe_index == VBE_DISPI_INDEX_CMONITORS)
+        || s->vbe_index == VBE_DISPI_INDEX_VBOX_VIDEO)
     {
         Log(("vgaIOPortWriteVBEData: VBE_DISPI_INDEX_ENABLE - Switching to host...\n"));
@@ -2888 +2898 @@
     if (cb == 2)
     {
+        /* Reading 16 bit value always reads the count of monitor.
+         * That is for compatibility with old additions. 
+         */
+        VGAState *s = PDMINS2DATA(pDevIns, PVGASTATE);
+        if (s->vbe_index == VBE_DISPI_INDEX_VBOX_VIDEO)
+        {
+            s->vbox_video_command = VBOX_VIDEO_QUERY_MONITOR_COUNT;
+        }
         *pu32 = vbe_ioport_read_data(PDMINS2DATA(pDevIns, PVGASTATE), Port);
         return VINF_SUCCESS;
@@ -2893 +2911 @@
     else if (cb == 4)
     {
-        /* Quick hack for getting the vram size. */
         VGAState *s = PDMINS2DATA(pDevIns, PVGASTATE);
-        *pu32 = s->vram_size;
+        if (s->vbe_index == VBE_DISPI_INDEX_VBOX_VIDEO)
+        {
+            *pu32 = vbe_ioport_read_data(PDMINS2DATA(pDevIns, PVGASTATE), Port);
+        }
+        else
+        {
+           /* Quick hack for getting the vram size. */
+           *pu32 = s->vram_size;
+        }
         return VINF_SUCCESS;
     }
@@ -4320 +4345 @@
 #ifdef CONFIG_BOCHS_VBE
     pData->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0;
-    pData->vbe_regs[VBE_DISPI_INDEX_CMONITORS] = pData->monitor_count;
+    pData->vbe_regs[VBE_DISPI_INDEX_VBOX_VIDEO] = pData->monitor_count;
     pData->vbe_bank_mask    = ((pData->vram_size >> 16) - 1);
 #endif /* CONFIG_BOCHS_VBE */
@@ -4556 +4581 @@
         pData->monitor_count = 1;
     }
-    pData->vbe_regs[VBE_DISPI_INDEX_CMONITORS] = pData->monitor_count;
+    pData->vbe_regs[VBE_DISPI_INDEX_VBOX_VIDEO] = pData->monitor_count;
     Log(("VGA: MonitorCount=%d\n", pData->monitor_count));
 

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

@@ -74 +74 @@
 #define VBE_DISPI_INDEX_X_OFFSET        0x8
 #define VBE_DISPI_INDEX_Y_OFFSET        0x9
-#define VBE_DISPI_INDEX_CMONITORS       0xa
+#define VBE_DISPI_INDEX_VBOX_VIDEO      0xa
 #define VBE_DISPI_INDEX_NB              0xb
 
@@ -82 +82 @@
 
 #ifdef VBOX
-/* The VBOX interface id. Indicates support for VBE_DISPI_INDEX_CMONITORS. */
+/* The VBOX interface id. Indicates support for VBE_DISPI_INDEX_VBOX_VIDEO. */
 #define VBE_DISPI_ID_VBOX_VIDEO         0xBE00
 #endif /* VBOX */
@@ -284 +284 @@
     /** Number of virtual monitors */
     uint32_t                    monitor_count;
-    uint32_t                    Padding0;   /* May be removed if more data is added */
+    /** The VBoxVideo extension command issued by guest. */
+    uint32_t                    vbox_video_command;
 
     /** Whether to render the guest VRAM to the framebuffer memory. False only for some LFB modes. */