Changeset 22022 in vbox for trunk/src/VBox

Timestamp:

Aug 6, 2009 10:55:28 AM (15 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: do all device dependant initialisation before device independant, to ensure that the framebuffer virtual width is known when we need it

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c (modified) (4 diffs)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_15.c

@@ -924 +924 @@
  *
  * End QUOTE.Initialise the initial video mode.
+ *
+ * Note that the order of operations here has been adjusted to match the
+ * Radeon HD driver.  We start with device-dependent initialisation (DDX),
+ * including modesetting (a.k.a RandR 1.2).  Among other things, this
+ * establishes the initial physical and virtual screen dimensions, which we
+ * need to know when we create the screen pixmap (the server's abstraction for
+ * the framebuffer).  We then do the device-independent initialisation (DIX)
+ * which sets up the server's internal structures to reflect the hardware
+ * setup.  Finally we do DPMS (stubs) and hardware cursor setup.
  */
 static Bool
@@ -953 +962 @@
     pVBox->savedPal = VBESetGetPaletteData(pVBox->pVbe, FALSE, 0, 256,
                                            NULL, FALSE, FALSE);
+
+    /* Initialise randr 1.2 mode-setting functions and set first mode. */
+    if (!xf86CrtcScreenInit(pScreen)) {
+        return FALSE;
+    }
+
+    if (!xf86SetDesiredModes(pScrn)) {
+        return FALSE;
+    }
+
+    /* set the viewport */
+    VBOXAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
+
+    /* Needed before we initialise DRI. */
+    pScrn->virtualX = (pScrn->virtualX + 7) & ~7;
+    pScrn->displayWidth = pScrn->virtualX;
 
     /* mi layer - reset the visual list (?)*/
@@ -963 +988 @@
     if (!miSetPixmapDepths())
         return (FALSE);
-
-    /* Needed before we initialise DRI. */
-    pScrn->virtualX = (pScrn->virtualX + 7) & ~7;
-    pScrn->displayWidth = pScrn->virtualX;
 
 #ifdef VBOX_DRI
@@ -1007 +1028 @@
        to (unsigned char *) later. */
     xf86DiDGAInit(pScreen, (unsigned long) pVBox->base);
-
-    /* Initialise randr 1.2 mode-setting functions and set first mode. */
-    if (!xf86CrtcScreenInit(pScreen)) {
-        return FALSE;
-    }
-
-    if (!xf86SetDesiredModes(pScrn)) {
-        return FALSE;
-    }
-
-    /* set the viewport */
-    VBOXAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
 
     /* software cursor */