Changeset 53812 in vbox

Timestamp:

Jan 15, 2015 10:36:04 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: set capabilities whenever VBVA is (re-)initialised.

Location:

trunk/src/VBox/Additions/x11/vboxvideo

Files:

• getmode.c (modified) (1 diff)
• vboxvideo.c (modified) (2 diffs)
• vbva.c (modified) (1 diff)

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

@@ -469 +469 @@
             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;

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

@@ -1073 +1073 @@
     pScrn->vtSema = TRUE;
 
+#if defined(VBOXVIDEO_13) && defined(RT_OS_LINUX)
+    VBoxSetUpLinuxACPI(pScreen);
+#endif
+
     vbox_open (pScrn, pScreen, pVBox);
     vboxEnableVbva(pScrn);
@@ -1171 +1175 @@
 #endif
 
-#if defined(VBOXVIDEO_13) && defined(RT_OS_LINUX)
-    VBoxSetUpLinuxACPI(pScreen);
-#endif
-
     /* Report any unused options (only for the first generation) */
     if (serverGeneration == 1)

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

@@ -282 +282 @@
          vboxDisableVbva(pScrn);
     }
+#ifdef VBOXVIDEO_13
+# ifdef RT_OS_LINUX
+    if (rc && pVBox->hACPIEventHandler != NULL)
+        /* We ignore the return value as the fall-back should be active
+         * anyway. */
+        VBoxHGSMISendCapsInfo(&pVBox->guestCtx, VBVACAPS_VIDEO_MODE_HINTS);
+# endif
+#endif
     return rc;
 }