Log enabling of DPMS even when it's not set in xorg.conf

This commit is contained in:
David Nusinow 2008-01-06 16:37:13 -05:00
parent 7e76221659
commit 260505e3c5

View File

@ -79,7 +79,6 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
&& !DPMSDisabledSwitch) && !DPMSDisabledSwitch)
DPMSEnabled = TRUE; DPMSEnabled = TRUE;
xf86MarkOptionUsed(DPMSOpt); xf86MarkOptionUsed(DPMSOpt);
xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
} else if (DPMSEnabledSwitch) { } else if (DPMSEnabledSwitch) {
if (!DPMSDisabledSwitch) if (!DPMSDisabledSwitch)
DPMSEnabled = TRUE; DPMSEnabled = TRUE;
@ -88,6 +87,8 @@ xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags)
else { else {
pDPMS->Enabled = defaultDPMSEnabled; pDPMS->Enabled = defaultDPMSEnabled;
} }
if (pDPMS->Enabled)
xf86DrvMsg(pScreen->myNum, X_CONFIG, "DPMS enabled\n");
pDPMS->CloseScreen = pScreen->CloseScreen; pDPMS->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = DPMSClose; pScreen->CloseScreen = DPMSClose;
DPMSCount++; DPMSCount++;