Changeset 53530 in vbox for trunk/src/VBox/Additions/x11/vboxvideo

Timestamp:

Dec 12, 2014 8:44:49 PM (10 years ago)

Author:

vboxsync

Message:

Additions/common and Additions/x11: add support for getting video mode hints through the VGA device.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• getmode.c (copied) (copied from trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c ) (7 diffs)
• vboxvideo.c (modified) (3 diffs)
• vboxvideo.h (modified) (3 diffs)
• vbva.c (modified) (1 diff)

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VirtualBox X11 Additions graphics driver utility functions
+ * VirtualBox X11 Additions graphics driver dynamic video mode functions.
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23 +23 @@
 #include "xf86.h"
 #include "dixstruct.h"
+#ifdef VBOX_GUESTR3XF86MOD
+# define EXTENSION_PROC_ARGS char *name, GCPtr pGC
+#endif
 #include "extnsionst.h"
 #include "windowstr.h"
@@ -33 +36 @@
 #endif
 
+#ifdef VBOXVIDEO_13
+# ifdef RT_OS_LINUX
+# include "randrstr.h"
+# include "xf86_OSproc.h"
+#  include <linux/input.h>
+#  include <dirent.h>
+#  include <errno.h>
+#  include <fcntl.h>
+#  include <unistd.h>
+# endif /* RT_OS_LINUX */
+#endif /* VBOXVIDEO_13 */
 /**************************************************************************
 * Main functions                                                          *
@@ -217 +231 @@
         pVBox->pScreens[i].aPreferredSize.cx = 1024;
         pVBox->pScreens[i].aPreferredSize.cy = 768;
+        pVBox->pScreens[i].afConnected       = true;
     }
     /* Set up the first mode correctly to match the requested initial mode. */
@@ -242 +257 @@
     unsigned i;
 
+#ifdef VBOXVIDEO_13
+    if (RT_SUCCESS(VBoxHGSMIGetModeHints(&pVBox->guestCtx, pVBox->cScreens,
+                                         pVBox->paVBVAModeHints)))
+    {
+        for (i = 0; i < pVBox->cScreens; ++i)
+        {
+            if (pVBox->paVBVAModeHints[i].magic == VBVAMODEHINT_MAGIC)
+            {
+                pVBox->pScreens[i].aPreferredSize.cx =
+                    pVBox->paVBVAModeHints[i].cx;
+                pVBox->pScreens[i].aPreferredSize.cy =
+                    pVBox->paVBVAModeHints[i].cy;
+                pVBox->pScreens[i].afConnected =
+                    pVBox->paVBVAModeHints[i].fEnabled;
+            }
+        }
+        return;
+    }
+#endif    
     /* We can get called early, before the root window is created. */
     if (!ROOT_WINDOW(pScrn))
@@ -253 +287 @@
         for (i = 0; i < prop->size && i < pVBox->cScreens; ++i)
         {
-            if (((int32_t *)prop->data)[i] == 0)
-            {
-                pVBox->pScreens[i].aPreferredSize.cx = 1024;
-                pVBox->pScreens[i].aPreferredSize.cy = 768;
-            }
-            else
+            if (((int32_t *)prop->data)[i] != 0)
             {
                 pVBox->pScreens[i].aPreferredSize.cx =
@@ -384 +413 @@
 
 #endif /* !VBOXVIDEO_13 */
+
+#ifdef VBOXVIDEO_13
+# ifdef RT_OS_LINUX
+static void acpiEventHandler(int fd, void *pvData)
+{
+    struct input_event event;
+    ssize_t rc;
+
+    RRGetInfo((ScreenPtr)pvData
+# if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 5
+              , TRUE
+# endif
+             );
+    do
+        rc = read(fd, &event, sizeof(event));
+    while (rc > 0 || (rc == -1 && errno == EINTR));
+    if (rc == -1 && errno != EAGAIN)  /* Why not just return 0? */
+        FatalError("Reading ACPI input event failed.\n");
+}
+
+void VBoxSetUpLinuxACPI(ScreenPtr pScreen)
+{
+    VBOXPtr pVBox = VBOXGetRec(xf86Screens[pScreen->myNum]);
+    struct dirent *pDirent;
+    DIR *pDir;
+    int fd = -1;
+
+    if (pVBox->fdACPIDevices != -1 || pVBox->hACPIEventHandler != NULL)
+        FatalError("ACPI input file descriptor not initialised correctly.\n");
+    pDir = opendir("/dev/input");
+    if (pDir == NULL)
+        return;
+    for (pDirent = readdir(pDir); pDirent != NULL; pDirent = readdir(pDir))
+    {
+        if (strncmp(pDirent->d_name, "event", sizeof("event") - 1) == 0)
+        {
+#define BITS_PER_BLOCK (sizeof(unsigned long) * 8)
+            char pszFile[64] = "/dev/input/";
+            char pszDevice[64] = "";
+            unsigned long afKeys[KEY_MAX / BITS_PER_BLOCK];
+
+            strncat(pszFile, pDirent->d_name, sizeof(pszFile));
+            if (fd != -1)
+                close(fd);
+            fd = open(pszFile, O_RDONLY | O_NONBLOCK);
+            if (   fd == -1
+                || ioctl(fd, EVIOCGNAME(sizeof(pszDevice)), pszDevice) == -1
+                || strcmp(pszDevice, "Video Bus") != 0)
+                continue;
+            if (   ioctl(fd, EVIOCGBIT(EV_KEY, KEY_MAX), afKeys) == -1
+                || ((   afKeys[KEY_SWITCHVIDEOMODE / BITS_PER_BLOCK]
+                     >> KEY_SWITCHVIDEOMODE % BITS_PER_BLOCK) & 1) == 0)
+                break;
+            if (ioctl(fd, EVIOCGRAB, (void *)1) != 0)
+                break;
+            pVBox->hACPIEventHandler
+                = xf86AddGeneralHandler(fd, acpiEventHandler, pScreen);
+            if (pVBox->hACPIEventHandler == NULL)
+                break;
+            /* We ignore the return value as the fall-back should be active
+             * anyway. */
+            VBoxHGSMISendCapsInfo(&pVBox->guestCtx, VBVACAPS_VIDEO_MODE_HINTS);
+            pVBox->fdACPIDevices = fd;
+            fd = -1;
+            break;
+#undef BITS_PER_BLOCK
+        }
+    }
+    if (fd != -1)
+        close(fd);
+    closedir(pDir);
+}
+
+void VBoxCleanUpLinuxACPI(ScreenPtr pScreen)
+{
+    VBOXPtr pVBox = VBOXGetRec(xf86Screens[pScreen->myNum]);
+    if (pVBox->fdACPIDevices != -1)
+        close(pVBox->fdACPIDevices);
+    pVBox->fdACPIDevices = -1;
+    xf86RemoveGeneralHandler(pVBox->hACPIEventHandler);
+    pVBox->hACPIEventHandler = NULL;
+}
+# endif /* RT_OS_LINUX */
+#endif /* VBOXVIDEO_13 */

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

@@ -149 +149 @@
 {
     if (!pScrn->driverPrivate)
-        pScrn->driverPrivate = calloc(sizeof(VBOXRec), 1);
+    {
+        VBOXPtr pVBox = (VBOXPtr)xnfcalloc(sizeof(VBOXRec), 1);
+        pScrn->driverPrivate = pVBox;
+#if defined(VBOXVIDEO_13) && defined(RT_OS_LINUX)
+        pVBox->fdACPIDevices = -1;
+#endif
+    }
 }
 
@@ -1141 +1147 @@
 #endif
 
+#if defined(VBOXVIDEO_13) && defined(RT_OS_LINUX)
+    VBoxSetUpLinuxACPI(pScreen);
+#endif
+
     /* Report any unused options (only for the first generation) */
     if (serverGeneration == 1)
@@ -1251 +1261 @@
 
     pScreen->CloseScreen = pVBox->CloseScreen;
+#if defined(VBOXVIDEO_13) && defined(RT_OS_LINUX)
+    VBoxCleanUpLinuxACPI(pScreen);
+#endif
 #ifndef XF86_SCRN_INTERFACE
     return pScreen->CloseScreen(pScreen->myNum, pScreen);

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

@@ -203 +203 @@
     /** The last requested framebuffer size. */
     RTRECTSIZE FBSize;
-#ifndef VBOXVIDEO_13
+#ifdef VBOXVIDEO_13
+    /** Array of structures for receiving mode hints. */
+    VBVAMODEHINT *paVBVAModeHints;
+# ifdef RT_OS_LINUX
+    /** Input device file descriptor for getting ACPI hot-plug events. */
+    int fdACPIDevices;
+    /** Input handler handle for ACPI hot-plug listener. */
+    void *hACPIEventHandler;
+# endif
+#else
     /** The original CreateScreenResources procedure which we wrap with our own.
      */
@@ -232 +241 @@
 extern void vboxDisableVbva(ScrnInfoPtr pScrn);
 
+/* getmode.c */
 extern unsigned vboxNextStandardMode(ScrnInfoPtr pScrn, unsigned cIndex,
                                      uint32_t *pcx, uint32_t *pcy);
@@ -239 +249 @@
 #ifndef VBOXVIDEO_13
 extern void VBoxSetUpRandR11(ScreenPtr pScreen);
+#else
+void VBoxSetUpLinuxACPI(ScreenPtr pScreen);
+void VBoxCleanUpLinuxACPI(ScreenPtr pScreen);
 #endif
 

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

@@ -201 +201 @@
     if (pVBox->pScreens == NULL)
         FatalError("Failed to allocate memory for screens array.\n");
+#ifdef VBOXVIDEO_13
+    pVBox->paVBVAModeHints = calloc(pVBox->cScreens,
+                                    sizeof(*pVBox->paVBVAModeHints));
+    if (pVBox->paVBVAModeHints == NULL)
+        FatalError("Failed to allocate memory for mode hints array.\n");
+#endif
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Requested monitor count: %u\n",
                pVBox->cScreens);