Changeset 22444 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Aug 25, 2009 5:03:25 PM (15 years ago)

Author:

vboxsync

Message:

HGSMI/VBVA use PCI IO ports.

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• VBoxVideo.cpp (modified) (4 diffs)
• VBoxVideo.h (modified) (11 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -1206 +1206 @@
          VBoxBiosString,
          sizeof(VBoxBiosString));
-#if defined(VBOX_WITH_HGSMI) && defined(VBOX_WITH_VIDEOHWACCEL)
-      VIDEO_ACCESS_RANGE tmpRanges[1];
-      ULONG slot;
-
-      /* need to call VideoPortGetAccessRanges to ensure interrupt info in ConfigInfo gets set up */
-      VP_STATUS status = VideoPortGetAccessRanges(HwDeviceExtension,
-                                        0,
-                                        NULL,
-                                        1,
-                                        tmpRanges,
-                                        NULL,
-                                        NULL,
-                                        (PULONG) &slot);
-      Assert(status == NO_ERROR );
-//      Assert(AccessRanges[0].RangeStart.QuadPart == tmpRanges[0].RangeStart.QuadPart);
-//      Assert(AccessRanges[0].RangeLength == tmpRanges[0].RangeLength);
-//      Assert(AccessRanges[0].RangeInIoSpace == tmpRanges[0].RangeInIoSpace);
-//      Assert(AccessRanges[0].RangeVisible == tmpRanges[0].RangeVisible);
-//      Assert(AccessRanges[0].RangeShareable == tmpRanges[0].RangeShareable);
-//      Assert(AccessRanges[0].RangePassive == tmpRanges[0].RangePassive);
-
-      /* no matter what we get with VideoPortGetAccessRanges, we assert the default ranges */
-#endif
+#ifdef VBOX_WITH_HGSMI
+      if (VBoxHGSMIIsSupported ((PDEVICE_EXTENSION)HwDeviceExtension))
+      {
+          dprintf(("VBoxVideo::VBoxVideoFindAdapter: calling VideoPortGetAccessRanges\n"));
+
+          /* Ports not yet found. */
+          ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.IOPortHost = 0;
+          ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.IOPortGuest = 0;
+
+          VIDEO_ACCESS_RANGE tmpRanges[2];
+          ULONG slot;
+
+          /* need to call VideoPortGetAccessRanges to ensure interrupt info in ConfigInfo gets set up */
+          VP_STATUS status = VideoPortGetAccessRanges(HwDeviceExtension,
+                                            0,
+                                            NULL,
+                                            sizeof (tmpRanges)/sizeof (tmpRanges[0]),
+                                            tmpRanges,
+                                            NULL,
+                                            NULL,
+                                            (PULONG) &slot);
+          if (status == NO_ERROR)
+          {
+              ULONG iRange = 0;
+              for (; iRange < sizeof (tmpRanges)/sizeof (tmpRanges[0]); iRange++)
+              {
+                  dprintf(("VBoxVideo::VBoxVideoFindAdapter: range[%i]:\n"
+                           "    RangeStart = 0x%llx\n"
+                           "    RangeLength = %d\n"
+                           "    RangeInIoSpace = %d\n"
+                           "    RangeVisible = %d\n"
+                           "    RangeShareable = %d\n"
+                           "    RangePassive = %d\n",
+                           iRange,
+                           tmpRanges[iRange].RangeStart.QuadPart,
+                           tmpRanges[iRange].RangeLength,
+                           tmpRanges[iRange].RangeInIoSpace,
+                           tmpRanges[iRange].RangeVisible,
+                           tmpRanges[iRange].RangeShareable,
+                           tmpRanges[iRange].RangePassive));
+                   if (tmpRanges[iRange].RangeInIoSpace)
+                   {
+                       PVOID ioBase = VideoPortGetDeviceBase(HwDeviceExtension, tmpRanges[iRange].RangeStart, 8, VIDEO_MEMORY_SPACE_IO);
+                       dprintf (("ioBase %p\n", ioBase));
+
+                       ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.IOPortHost = (RTIOPORT)ioBase + VGA_PORT_OFF_HGSMI_HOST;
+                       ((PDEVICE_EXTENSION)HwDeviceExtension)->u.primary.IOPortGuest = (RTIOPORT)ioBase + VGA_PORT_OFF_HGSMI_GUEST;
+                   }
+              }
+          }
+
+          /* no matter what we get with VideoPortGetAccessRanges, we assert the default ranges */
+      }
+#endif /* VBOX_WITH_HGSMI */
       rc = VideoPortVerifyAccessRanges(HwDeviceExtension, 1, AccessRanges);
       dprintf(("VBoxVideo::VBoxVideoFindAdapter: VideoPortVerifyAccessRanges returned 0x%x\n", rc));
@@ -1777 +1808 @@
                 VideoPortWritePortUlong((PULONG)VBE_DISPI_IOPORT_DATA, VBOX_VIDEO_INTERPRET_DISPLAY_MEMORY_BASE + pDevExt->iDevice);
 #else
-                VBoxVideoHostWriteUlong(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, VBE_DISPI_INDEX_VBOX_VIDEO, VBOX_VIDEO_INTERPRET_DISPLAY_MEMORY_BASE + pDevExt->iDevice);
+                VBoxVideoVBEWriteUlong(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, VBE_DISPI_INDEX_VBOX_VIDEO, VBOX_VIDEO_INTERPRET_DISPLAY_MEMORY_BASE + pDevExt->iDevice);
 #endif
             }
@@ -2044 +2075 @@
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_DATA, VBE_DISPI_DISABLED);
 #else
-    VBoxVideoHostWriteUshort(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED);
+    VBoxVideoVBEWriteUshort(((PDEVICE_EXTENSION)HwDeviceExtension)->pPrimary, VBE_DISPI_INDEX_ENABLE, VBE_DISPI_DISABLED);
 #endif
 
@@ -2159 +2190 @@
     /** @todo read from the port to see if the mode switch was successful */
 #else
-    VBoxVideoHostWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_XRES, (USHORT)ModeInfo->VisScreenWidth);
-    VBoxVideoHostWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_YRES, (USHORT)ModeInfo->VisScreenHeight);
-    VBoxVideoHostWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_BPP, (USHORT)ModeInfo->BitsPerPlane);
-    VBoxVideoHostWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
+    VBoxVideoVBEWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_XRES, (USHORT)ModeInfo->VisScreenWidth);
+    VBoxVideoVBEWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_YRES, (USHORT)ModeInfo->VisScreenHeight);
+    VBoxVideoVBEWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_BPP, (USHORT)ModeInfo->BitsPerPlane);
+    VBoxVideoVBEWriteUshort(DeviceExtension->pPrimary, VBE_DISPI_INDEX_ENABLE, VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
 #endif
 

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

@@ -51 +51 @@
 #define VBE_DISPI_INDEX_VIRT_HEIGHT     0x7
 #define VBE_DISPI_INDEX_VBOX_VIDEO      0xa
-#ifdef VBOX_WITH_HGSMI
-#define VBE_DISPI_INDEX_VBVA_HOST       0xb
-#define VBE_DISPI_INDEX_VBVA_GUEST      0xc
-#endif /* VBOX_WITH_HGSMI */
 
 #define VBE_DISPI_ID2                   0xB0C2
@@ -70 +66 @@
 #define VBE_DISPI_TOTAL_VIDEO_MEMORY_BYTES      (VBE_DISPI_TOTAL_VIDEO_MEMORY_KB * 1024)
 
+#ifdef VBOX_WITH_HGSMI
+#define VGA_PORT_OFF_HGSMI_HOST  0
+#define VGA_PORT_OFF_HGSMI_GUEST 4
+#endif /* VBOX_WITH_HGSMI */
+
 typedef struct _DEVICE_EXTENSION
 {
@@ -142 +143 @@
 
            PSPIN_LOCK pGHRWLock; /* lock for making guest->host read/writes atomic */
+
+           /* The IO Port Number for host commands. */
+           RTIOPORT IOPortHost;
+
+           /* The IO Port Number for guest commands. */
+           RTIOPORT IOPortGuest;
 #endif /* VBOX_WITH_HGSMI */
        } primary;
@@ -256 +263 @@
 #ifdef VBOX_WITH_HGSMI
 
-DECLINLINE(void) VBoxVideoHostWriteUlongLocked(USHORT dataType, ULONG data)
+DECLINLINE(void) VBoxVideoVBEWriteUlongLocked(USHORT dataType, ULONG data)
 {
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, dataType);
@@ -262 +269 @@
 }
 
-DECLINLINE(void) VBoxVideoHostWriteUshortLocked(USHORT dataType, USHORT data)
+DECLINLINE(void) VBoxVideoVBEWriteUshortLocked(USHORT dataType, USHORT data)
 {
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, dataType);
@@ -268 +275 @@
 }
 
-DECLINLINE(ULONG) VBoxVideoHostReadUlongLocked (USHORT dataType)
+DECLINLINE(ULONG) VBoxVideoVBEReadUlongLocked (USHORT dataType)
 {
     VideoPortWritePortUshort((PUSHORT)VBE_DISPI_IOPORT_INDEX, dataType);
@@ -274 +281 @@
 }
 
-DECLINLINE(void) VBoxVideoHostWriteUlong(PDEVICE_EXTENSION PrimaryExtension, USHORT dataType, ULONG data)
+DECLINLINE(void) VBoxVideoVBEWriteUlong(PDEVICE_EXTENSION PrimaryExtension, USHORT dataType, ULONG data)
 {
     UCHAR oldIrql;
@@ -280 +287 @@
                 PrimaryExtension->u.primary.pGHRWLock,
             &oldIrql);
-    VBoxVideoHostWriteUlongLocked(dataType, data);
+    VBoxVideoVBEWriteUlongLocked(dataType, data);
     VideoPortReleaseSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
@@ -286 +293 @@
 }
 
-DECLINLINE(void) VBoxVideoHostWriteUshort(PDEVICE_EXTENSION PrimaryExtension, USHORT dataType, USHORT data)
+DECLINLINE(void) VBoxVideoVBEWriteUshort(PDEVICE_EXTENSION PrimaryExtension, USHORT dataType, USHORT data)
 {
     UCHAR oldIrql;
@@ -292 +299 @@
                 PrimaryExtension->u.primary.pGHRWLock,
             &oldIrql);
-    VBoxVideoHostWriteUshortLocked(dataType, data);
+    VBoxVideoVBEWriteUshortLocked(dataType, data);
     VideoPortReleaseSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
@@ -298 +305 @@
 }
 
-DECLINLINE(ULONG) VBoxVideoHostReadUlong(PDEVICE_EXTENSION PrimaryExtension, USHORT dataType)
-{
-        ULONG data;
+DECLINLINE(ULONG) VBoxVideoVBEReadUlong(PDEVICE_EXTENSION PrimaryExtension, USHORT dataType)
+{
+    ULONG data;
     UCHAR oldIrql;
     VideoPortAcquireSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
             &oldIrql);
-        data = VBoxVideoHostReadUlongLocked(dataType);
+    data = VBoxVideoVBEReadUlongLocked(dataType);
     VideoPortReleaseSpinLock(PrimaryExtension,
                 PrimaryExtension->u.primary.pGHRWLock,
             oldIrql);
     return data;
+}
+
+/*
+ * Host and Guest port IO helpers.
+ */
+DECLINLINE(void) VBoxHGSMIHostWrite(PDEVICE_EXTENSION PrimaryExtension, ULONG data)
+{
+    VideoPortWritePortUlong((PULONG)PrimaryExtension->pPrimary->u.primary.IOPortHost, data);
+}
+
+DECLINLINE(ULONG) VBoxHGSMIHostRead(PDEVICE_EXTENSION PrimaryExtension)
+{
+    return VideoPortReadPortUlong((PULONG)PrimaryExtension->pPrimary->u.primary.IOPortHost);
+}
+
+DECLINLINE(void) VBoxHGSMIGuestWrite(PDEVICE_EXTENSION PrimaryExtension, ULONG data)
+{
+    VideoPortWritePortUlong((PULONG)PrimaryExtension->pPrimary->u.primary.IOPortGuest, data);
+}
+
+DECLINLINE(ULONG) VBoxHGSMIGuestRead(PDEVICE_EXTENSION PrimaryExtension)
+{
+    return VideoPortReadPortUlong((PULONG)PrimaryExtension->pPrimary->u.primary.IOPortGuest);
 }