Changeset 56944 in vbox for trunk/src/VBox/Devices

Timestamp:

Jul 15, 2015 6:25:42 PM (10 years ago)

Author:

vboxsync

Message:

SVGA: Assertions triggered by BB.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (2 diffs)
• DevVGA.cpp (modified) (3 diffs)

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

@@ -989 +989 @@
         ||  pThis->svga.uBpp == 0)
     {
-        /* Invalid mode change. */
+        /* Invalid mode change - BB does this early in the boot up. */
         Log(("vmsvgaChangeMode: BOGUS sEnable LFB mode and resize to (%d,%d) bpp=%d\n", pThis->svga.uWidth, pThis->svga.uHeight, pThis->svga.uBpp));
         return VINF_SUCCESS;
@@ -3487 +3487 @@
         if (pThis->svga.uHeight != VMSVGA_VAL_UNINITIALIZED)
         {
+#ifndef DEBUG_bird /* BB-10.3.1 triggers this as it initializes everything to zero. Better just ignore it. */
             Assert(pThis->svga.cbScanline);
+#endif
             /* Hardware enabled; return real framebuffer size .*/
             cbFrameBuffer = (uint32_t)pThis->svga.uHeight * pThis->svga.cbScanline;

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

@@ -2216 +2216 @@
  */
 static int vmsvga_draw_graphic(PVGASTATE pThis, bool full_update, bool fFailOnResize, bool reset_dirty,
-                PDMIDISPLAYCONNECTOR *pDrv)
+                               PDMIDISPLAYCONNECTOR *pDrv)
 {
     int y, page_min, page_max, linesize, y_start;
@@ -2226 +2226 @@
 
     if (    pThis->svga.uWidth  == VMSVGA_VAL_UNINITIALIZED
+        ||  pThis->svga.uWidth  == 0
         ||  pThis->svga.uHeight == VMSVGA_VAL_UNINITIALIZED
-        ||  pThis->svga.uBpp    == VMSVGA_VAL_UNINITIALIZED)
+        ||  pThis->svga.uHeight == 0
+        ||  pThis->svga.uBpp    == VMSVGA_VAL_UNINITIALIZED
+        ||  pThis->svga.uBpp    == 0)
     {
         /* Intermediate state; skip redraws. */
@@ -6933 +6936 @@
          */
         rc = PDMDevHlpDriverAttach(pDevIns, PDM_STATUS_LUN, &pThis->IBase, &pBase, "Status Port");
-        AssertRC(rc);
         if (RT_SUCCESS(rc))
         {