configure.ac | 2 +- src/via_display.c | 41 ++++++++++++++++++++++++++++++++++++++++- src/via_ums.h | 1 + 3 files changed, 42 insertions(+), 2 deletions(-)
New commits: commit 6e6957840616695221c74c2f08f7e8ba8eaaabc9 Author: Kevin Brace <kevinbr...@gmx.com> Date: Tue Apr 26 08:15:45 2016 -0700 Version bumped to 0.4.141 Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/configure.ac b/configure.ac index 0956625..6f46048 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ(2.57) AC_INIT([xf86-video-openchrome], - [0.4.140], + [0.4.141], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome], [xf86-video-openchrome]) commit c0e4c70cd76d206868f3bb5e387fe63945e7237b Author: Kevin Brace <kevinbr...@gmx.com> Date: Tue Apr 26 08:13:49 2016 -0700 Added debug messages to iga1_crtc_dpms This function is located inside via_display.c. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_display.c b/src/via_display.c index 90bd501..0fe0c13 100644 --- a/src/via_display.c +++ b/src/via_display.c @@ -1085,6 +1085,9 @@ iga1_crtc_dpms(xf86CrtcPtr crtc, int mode) VIAPtr pVia = VIAPTR(pScrn); VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo; + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Entered iga1_crtc_dpms.\n")); + switch (mode) { case DPMSModeOn: viaIGA1DPMSControl(pScrn, 0x00); @@ -1115,12 +1118,14 @@ iga1_crtc_dpms(xf86CrtcPtr crtc, int mode) break; default: - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Invalid DPMS mode %d\n", + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Invalid DPMS Mode: %d\n", mode); break; } //vgaHWSaveScreen(pScrn->pScreen, mode); + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Exiting iga1_crtc_dpms.\n")); } static void commit b725afd9baebfb9a7c4fa7fb94250537e9ce6d9b Author: Kevin Brace <kevinbr...@gmx.com> Date: Tue Apr 26 08:02:53 2016 -0700 Implementing all DPMS modes for IGA1 Previously, not all DPMS (Display Power Management Signaling) modes were implemented for IGA1. Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/src/via_display.c b/src/via_display.c index edf2add..90bd501 100644 --- a/src/via_display.c +++ b/src/via_display.c @@ -31,6 +31,24 @@ #include "via_driver.h" /* + * Controls IGA1 DPMS State. + */ +void +viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8 DPMS_Control) +{ + vgaHWPtr hwp = VGAHWPTR(pScrn); + + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Entered viaIGA1DPMSControl.\n")); + + /* 3X5.36[5:4]: DPMS Control */ + ViaCrtcMask(hwp, 0x36, (DPMS_Control << 4) & 0x30, 0x30); + + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Exiting viaIGA1DPMSControl.\n")); +} + +/* * Controls IGA2 display channel state. */ void @@ -1069,13 +1087,29 @@ iga1_crtc_dpms(xf86CrtcPtr crtc, int mode) switch (mode) { case DPMSModeOn: + viaIGA1DPMSControl(pScrn, 0x00); + if (pBIOSInfo->SimultaneousEnabled) ViaDisplayEnableSimultaneous(pScrn); break; case DPMSModeStandby: + viaIGA1DPMSControl(pScrn, 0x01); + + if (pBIOSInfo->SimultaneousEnabled) + ViaDisplayDisableSimultaneous(pScrn); + break; + case DPMSModeSuspend: + viaIGA1DPMSControl(pScrn, 0x02); + + if (pBIOSInfo->SimultaneousEnabled) + ViaDisplayDisableSimultaneous(pScrn); + break; + case DPMSModeOff: + viaIGA1DPMSControl(pScrn, 0x03); + if (pBIOSInfo->SimultaneousEnabled) ViaDisplayDisableSimultaneous(pScrn); break; diff --git a/src/via_ums.h b/src/via_ums.h index f4c8200..78e5837 100644 --- a/src/via_ums.h +++ b/src/via_ums.h @@ -204,6 +204,7 @@ void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock); void ViaSetUseExternalClock(vgaHWPtr hwp); /* via_display.c */ +void viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8 DPMS_Control); void viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State); void viaDisplayInit(ScrnInfoPtr pScrn); void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn); _______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel