Changeset 85718 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/QemuVideoDxe/Driver.c

Timestamp:

Aug 12, 2020 4:09:12 PM (5 years ago)

Author:

vboxsync

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

139865

Message:

Devices/EFI: Merge edk-stable202005 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• OvmfPkg/QemuVideoDxe/Driver.c (modified) (6 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/OvmfPkg/QemuVideoDxe/Driver.c

@@ -154 +154 @@
   Card = QemuVideoDetect(Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr.DeviceId);
   if (Card != NULL) {
-    DEBUG ((EFI_D_INFO, "QemuVideo: %s detected\n", Card->Name));
+    DEBUG ((DEBUG_INFO, "QemuVideo: %s detected\n", Card->Name));
     Status = EFI_SUCCESS;
   }
@@ -207 +207 @@
 
   //
-  // Allocate Private context data for GOP inteface.
+  // Allocate Private context data for GOP interface.
   //
   Private = AllocateZeroPool (sizeof (QEMU_VIDEO_PRIVATE_DATA));
@@ -293 +293 @@
 
   SupportedVgaIo &= (UINT64)(EFI_PCI_IO_ATTRIBUTE_VGA_IO | EFI_PCI_IO_ATTRIBUTE_VGA_IO_16);
-  if (SupportedVgaIo == 0) {
+  if (SupportedVgaIo == 0 && IS_PCI_VGA (&Pci)) {
     Status = EFI_UNSUPPORTED;
     goto ClosePciIo;
@@ -325 +325 @@
     if (EFI_ERROR (Status) ||
         MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM) {
-      DEBUG ((EFI_D_INFO, "QemuVideo: No mmio bar, fallback to port io\n"));
+      DEBUG ((DEBUG_INFO, "QemuVideo: No mmio bar, fallback to port io\n"));
       Private->Variant = QEMU_VIDEO_BOCHS;
     } else {
-      DEBUG ((EFI_D_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n",
+      DEBUG ((DEBUG_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n",
               MmioDesc->AddrRangeMin));
     }
@@ -353 +353 @@
     BochsId = BochsRead(Private, VBE_DISPI_INDEX_ID);
     if ((BochsId & 0xFFF0) != VBE_DISPI_ID0) {
-      DEBUG ((EFI_D_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", BochsId));
+      DEBUG ((DEBUG_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", BochsId));
       Status = EFI_DEVICE_ERROR;
       goto RestoreAttributes;
@@ -960 +960 @@
   )
 {
-  DEBUG ((EFI_D_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n",
+  DEBUG ((DEBUG_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n",
           ModeData->Width, ModeData->Height, ModeData->ColorDepth));