Changeset 67812 in vbox

Timestamp:

Jul 6, 2017 7:13:21 AM (8 years ago)

Author:

vboxsync

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

116737

Message:

VGABIOS: VBE function 6 needs to fail if requested width causes virtual height to be too low.

File:

• trunk/src/VBox/Devices/Graphics/BIOS/vbe.c (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/BIOS/vbe.c

@@ -119 +119 @@
     out_w(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_YRES);
     out_w(VBE_DISPI_IOPORT_DATA, yres);
+}
+
+static uint16_t dispi_get_yres(void)
+{
+    out_w(VBE_DISPI_IOPORT_INDEX, VBE_DISPI_INDEX_YRES);
+    return in_w(VBE_DISPI_IOPORT_DATA);
 }
 
@@ -745 +751 @@
     uint8_t     bpp;
     uint8_t     subfn;
+    uint16_t    old_vw;
 
     bpp    = dispi_get_bpp();
+    old_vw = dispi_get_virt_width();
     result = 0x004F;
     val    = *CX;
@@ -773 +781 @@
         *BX = val;                          /* Bytes per scanline. */
         *DX = dispi_get_virt_height();      /* Height in lines. */
+        if (*DX < dispi_get_yres()) {
+            dispi_set_virt_width(old_vw);
+            result = 0x200;
+        }
         break;
     default: