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

Timestamp:

Apr 17, 2015 3:25:44 PM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/vboxvideo: we do not need a separate vbox_output_dpms() call-back.

File:

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

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

@@ -500 +500 @@
 vbox_output_dpms (xf86OutputPtr output, int mode)
 {
-    VBOXPtr pVBox = VBOXGetRec(output->scrn);
-    unsigned cDisplay = (uintptr_t)output->driver_private;
-    bool fEnabled = (mode == DPMSModeOn);
-
-    TRACE_LOG("cDisplay=%u, mode=%i\n", cDisplay, mode);
-    pVBox->pScreens[cDisplay].fOutputEnabled = fEnabled;
-    /* Don't fiddle with the hardware if we are switched
-     * to a virtual terminal. */
-    if (!output->scrn->vtSema) {
-        xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
-                   "We do not own the active VT, exiting.\n");
-        return;
-    }
-    if (   pVBox->pScreens[cDisplay].aScreenLocation.cx
-        && pVBox->pScreens[cDisplay].aScreenLocation.cy)
-        VBOXSetMode(output->scrn, cDisplay,
-                    pVBox->pScreens[cDisplay].aScreenLocation.cx,
-                    pVBox->pScreens[cDisplay].aScreenLocation.cy,
-                    pVBox->pScreens[cDisplay].aScreenLocation.x,
-                    pVBox->pScreens[cDisplay].aScreenLocation.y);
+    (void)output; (void)mode;
 }
 
@@ -1447 +1428 @@
 #ifdef VBOXVIDEO_13
     for (i = 0; i < pVBox->cScreens; ++i)
-        vbox_output_dpms(pVBox->pScreens[i].paOutputs, DPMSModeOff);
+        vbox_crtc_dpms(pVBox->pScreens[i].paCrtcs, DPMSModeOff);
 #endif
     vboxDisableVbva(pScrn);
@@ -1478 +1459 @@
 
         for (i = 0; i < pVBox->cScreens; ++i)
-            vbox_output_dpms(pVBox->pScreens[i].paOutputs, DPMSModeOff);
+            vbox_crtc_dpms(pVBox->pScreens[i].paCrtcs, DPMSModeOff);
 #endif
         vboxDisableVbva(pScrn);