Changeset 34747 in vbox for trunk/src

Timestamp:

Dec 6, 2010 1:44:49 PM (14 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: main code for multi-monitor X11 and various small fixes

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• Makefile.kmk (modified) (1 diff)
• undefined_13 (modified) (2 diffs)
• vboxutils.c (modified) (1 diff)
• vboxvideo.c (modified) (10 diffs)
• vboxvideo.h (modified) (1 diff)
• vboxvideo_13.c (deleted)

trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

@@ -131 +131 @@
 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
-vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) vboxvideo
+vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
 vboxvideo_drv_13_INCS = \
         $(VBOX_PATH_X11_XORG_1_3) \

trunk/src/VBox/Additions/x11/vboxvideo/undefined_13

@@ -112 +112 @@
 sigfillset
 sprintf
+snprintf
 sscanf
 sscanf
@@ -191 +192 @@
 xf86UnMapVidMem
 xf86sprintf
+xf86snprintf

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

@@ -215 +215 @@
                 || aRects[i].y2 <   pVBox->aScreenLocation[j].y)
                 continue;
-            cmdHdr.x = (int16_t)aRects[i].x1 - pVBox->aScreenLocation[j].x;
-            cmdHdr.y = (int16_t)aRects[i].y1 - pVBox->aScreenLocation[j].y;
+            cmdHdr.x =   (int16_t)aRects[i].x1
+                       - pVBox->aScreenLocation[j].x * 2
+                       + pVBox->aScreenLocation[0].x;
+            cmdHdr.y =   (int16_t)aRects[i].y1
+                       - pVBox->aScreenLocation[j].y * 2
+                       + pVBox->aScreenLocation[0].y;
             cmdHdr.w = (uint16_t)(aRects[i].x2 - aRects[i].x1);
             cmdHdr.h = (uint16_t)(aRects[i].y2 - aRects[i].y1);
 
-            TRACE_LOG("x=%d, y=%d, w=%d, z=%d\n", cmdHdr.x, cmdHdr.y,
-                      cmdHdr.w, cmdHdr.h);
+            TRACE_LOG("display=%u, x=%d, y=%d, w=%d, h=%d\n",
+                      j, cmdHdr.x, cmdHdr.y, cmdHdr.w, cmdHdr.h);
             
             VBoxVBVABufferBeginUpdate(&pVBox->aVbvaCtx[j], &pVBox->guestCtx);

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

@@ -301 +301 @@
     TRACE_LOG("name=%s, HDisplay=%d, VDisplay=%d, x=%d, y=%d\n", adjusted_mode->name,
            adjusted_mode->HDisplay, adjusted_mode->VDisplay, x, y);
-    VBOXSetMode(crtc->scrn, 0, adjusted_mode->HDisplay, adjusted_mode->VDisplay,
-                x, y);
+    VBOXSetMode(crtc->scrn, (uint32_t)crtc->driver_private,
+                adjusted_mode->HDisplay, adjusted_mode->VDisplay, x, y);
     /* Don't remember any modes set while we are seamless, as they are
      * just temporary. */
@@ -713 +713 @@
     Gamma gzeros = {0.0, 0.0, 0.0};
     rgb rzeros = {0, 0, 0};
-#ifdef VBOXVIDEO_13
-    xf86OutputPtr output;
-#endif
     unsigned DispiId;
 
@@ -822 +819 @@
         if (!xf86SetDepthBpp(pScrn, cBits, 0, 0, Support32bppFb))
             return FALSE;
-#ifndef VBOXVIDEO_13
         vboxAddModes(pScrn, cx, cy);
-#endif
     }
     if (pScrn->bitsPerPixel != 32 && pScrn->bitsPerPixel != 16)
@@ -840 +835 @@
     pScrn->virtualX = 32000;
     pScrn->virtualY = 32000;
-
-    /* Initialise CRTC and output configuration for use with randr1.2. */
-    xf86CrtcConfigInit(pScrn, &VBOXCrtcConfigFuncs);
-
-    /* Setup our single virtual CRTC. */
-    xf86CrtcCreate(pScrn, &VBOXCrtcFuncs);
-
-    /* Set up our single virtual output. */
-    output = xf86OutputCreate(pScrn, &VBOXOutputFuncs, "VBOX1");
-
-    /* Set a sane minimum and maximum mode size */
-    xf86CrtcSetSizeRange(pScrn, 64, 64, 32000, 32000);
-
-    /* We are not interested in the monitor section in the configuration file. */
-    xf86OutputUseScreenMonitor(output, FALSE);
-    output->possible_crtcs = 1;
-    output->possible_clones = 0;
-
-    /* Now create our initial CRTC/output configuration. */
-    if (!xf86InitialConfiguration(pScrn, TRUE)) {
-        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Initial CRTC configuration failed!\n");
-        return (FALSE);
-    }
-#else /* !VBOXVIDEO_13 */
+#else
     /* We don't validate with xf86ValidateModes and xf86PruneModes as we
      * already know what we like and what we don't. */
@@ -873 +845 @@
     pScrn->virtualY = pScrn->currentMode->VDisplay;
 
+#endif /* !VBOXVIDEO_13 */
+
+    /* Needed before we initialise DRI. */
     pScrn->displayWidth = pScrn->virtualX;
 
     xf86PrintModes(pScrn);
-
-#endif /* !VBOXVIDEO_13 */
 
     /* Colour weight - we always call this, since we are always in
@@ -970 +943 @@
     if (!miSetPixmapDepths())
         return (FALSE);
-
-    /* Needed before we initialise DRI. */
-    pScrn->displayWidth = pScrn->virtualX;
 
 #ifdef VBOX_DRI
@@ -1017 +987 @@
 
 #ifdef VBOXVIDEO_13
+    /* Initialise CRTC and output configuration for use with randr1.2. */
+    xf86CrtcConfigInit(pScrn, &VBOXCrtcConfigFuncs);
+
+    {
+        uint32_t i;
+
+        for (i = 0; i < pVBox->cScreens; ++i)
+        {
+            char szOutput[256];
+
+            /* Setup our virtual CRTCs. */
+            pVBox->paCrtcs[i] = xf86CrtcCreate(pScrn, &VBOXCrtcFuncs);
+            pVBox->paCrtcs[i]->driver_private = (void *)i;
+
+            /* Set up our virtual outputs. */
+            snprintf(szOutput, sizeof(szOutput), "VBOX%u", i);
+            pVBox->paOutputs[i] = xf86OutputCreate(pScrn, &VBOXOutputFuncs,
+                                                   szOutput);
+
+            /* We are not interested in the monitor section in the
+             * configuration file. */
+            xf86OutputUseScreenMonitor(pVBox->paOutputs[i], FALSE);
+            pVBox->paOutputs[i]->possible_crtcs = 1 << i;
+            pVBox->paOutputs[i]->possible_clones = 0;
+            TRACE_LOG("Created crtc (%p) and output %s (%p)\n",
+                      (void *)pVBox->paCrtcs[i], szOutput,
+                      (void *)pVBox->paOutputs[i]);
+        }
+    }
+
+    /* Set a sane minimum and maximum mode size */
+    xf86CrtcSetSizeRange(pScrn, 64, 64, 32000, 32000);
+
+    /* Now create our initial CRTC/output configuration. */
+    if (!xf86InitialConfiguration(pScrn, TRUE)) {
+        xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Initial CRTC configuration failed!\n");
+        return (FALSE);
+    }
+    
     /* Initialise randr 1.2 mode-setting functions and set first mode.
      * Note that the mode won't be usable until the server has resized the
@@ -1180 +1189 @@
         xf86PrintModes(pScrn);
     }
-#endif
     if (rc && !vboxGuestIsSeamless(pScrn))
         vboxSaveVideoMode(pScrn, pMode->HDisplay, pMode->VDisplay,
                           pScrn->bitsPerPixel);
+#endif
     if (pVBox->accessEnabled)
         pVBox->EnableDisableFBAccess(scrnIndex, TRUE);
@@ -1197 +1206 @@
             unsigned cHeight, int x, int y)
 {
-    VBOXPtr pVBox;
+    VBOXPtr pVBox = VBOXGetRec(pScrn);
     Bool rc = TRUE;
+    uint32_t xRel = cDisplay ? x - pVBox->aScreenLocation[0].x : 0;
+    uint32_t yRel = cDisplay ? y - pVBox->aScreenLocation[0].y : 0;
 
     int bpp = pScrn->depth == 24 ? 32 : 16;
     TRACE_LOG("cDisplay=%u, cWidth=%u, cHeight=%u, x=%d, y=%d, displayWidth=%d\n",
               cDisplay, cWidth, cHeight, x, y, pScrn->displayWidth);
-    pVBox = VBOXGetRec(pScrn);
     /* Don't fiddle with the hardware if we are switched
      * to a virtual terminal. */
@@ -1218 +1228 @@
         && (pVBox->fHaveHGSMI)
         && !pVBox->vtSwitch)
-        VBoxHGSMIProcessDisplayInfo(&pVBox->guestCtx, cDisplay, x, y,
+        VBoxHGSMIProcessDisplayInfo(&pVBox->guestCtx, cDisplay, xRel, yRel,
                                     (y * pScrn->displayWidth + x) * bpp / 8,
                                     pScrn->displayWidth * bpp / 8,
                                     cWidth, cHeight, bpp);
-    pVBox->aScreenLocation[0].cx = cWidth;
-    pVBox->aScreenLocation[0].cy = cHeight;
-    pVBox->aScreenLocation[0].x = x;
-    pVBox->aScreenLocation[0].y = y;
+    pVBox->aScreenLocation[cDisplay].cx = cWidth;
+    pVBox->aScreenLocation[cDisplay].cy = cHeight;
+    pVBox->aScreenLocation[cDisplay].x = x;
+    pVBox->aScreenLocation[cDisplay].y = y;
     TRACE_LOG("returning %s\n", rc ? "TRUE" : "FALSE");
     return rc;

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

@@ -212 +212 @@
      * sending dirty rectangle information to the right one. */
     RTRECT2 aScreenLocation[VBOX_VIDEO_MAX_SCREENS];
+#ifdef VBOXVIDEO_13
+    /** The virtual crtcs */
+    struct _xf86Crtc *paCrtcs[VBOX_VIDEO_MAX_SCREENS];
+    struct _xf86Output *paOutputs[VBOX_VIDEO_MAX_SCREENS];
+#endif
     /** Offsets of VBVA buffers in video RAM */
     uint32_t aoffVBVABuffer[VBOX_VIDEO_MAX_SCREENS];