configure.ac | 2 - src/via_display.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/via_ums.h | 1 3 files changed, 64 insertions(+), 1 deletion(-)
New commits: commit 158ea17e8c0e525f9239706449d2d86b7c168c83 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sun May 22 23:34:25 2016 -0700 Version bumped to 0.4.153 Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/configure.ac b/configure.ac index 135c921..9916f6d 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ(2.57) AC_INIT([xf86-video-openchrome], - [0.4.152], + [0.4.153], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome], [xf86-video-openchrome]) commit 6e8e8dbf3447d049ac5bbfd3551aeb359f664d34 Author: Kevin Brace <kevinbr...@gmx.com> Date: Sun May 22 23:27:17 2016 -0700 Added viaIGA1Init viaIGA1Init function initializes IGA1 specific registers. 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 6b157dc..803a991 100644 --- a/src/via_display.c +++ b/src/via_display.c @@ -504,6 +504,67 @@ viaIGAInitCommon(ScrnInfoPtr pScrn) "Exiting viaIGAInitCommon.\n")); } +/* + * Initialize IGA1 (Integrated Graphics Accelerator) registers. + */ +void +viaIGA1Init(ScrnInfoPtr pScrn) +{ + vgaHWPtr hwp = VGAHWPTR(pScrn); +#ifdef HAVE_DEBUG + CARD8 temp; +#endif + + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Entered viaIGA1Init.\n")); + +#ifdef HAVE_DEBUG + temp = hwp->readSeq(hwp, 0x1B); + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "SR1B: 0x%02X\n", temp)); + temp = hwp->readSeq(hwp, 0x2D); + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "SR2D: 0x%02X\n", temp)); +#endif + + /* 3C5.1B[7:6] - Secondary Display Engine (Gated Clock <LCK>) + * 0x: Clock always off + * 10: Clock always on + * 11: Clock on/off according to the + * Power Management Status (PMS) + * 3C5.1B[5:4] - Primary Display Engine (Gated Clock <VCK>) + * 0x: Clock always off + * 10: Clock always on + * 11: Clock on/off according to the PMS + * 3C5.1B[3:1] - Reserved + * 3C5.1B[0] - Primary Displayâs LUT On/Off + * 0: On + * 1: Off */ + ViaSeqMask(hwp, 0x1B, 0x30, 0x31); + + /* 3C5.2D[7:6] - E3_ECK_N Selection + * 00: E3_ECK_N + * 01: E3_ECK + * 10: delayed E3_ECK_N + * 11: delayed E3_ECK + * 3C5.2D[5:4] - VCK (Primary Display Clock) PLL Power Control + * 0x: PLL power-off + * 10: PLL always on + * 11: PLL on/off according to the PMS + * 3C5.2D[3:2] - LCK (Secondary Display Clock) PLL Power Control + * 0x: PLL power-off + * 10: PLL always on + * 11: PLL on/off according to the PMS + * 3C5.2D[1:0] - ECK (Engine Clock) PLL Power Control + * 0x: PLL power-off + * 10: PLL always on + * 11: PLL on/off according to the PMS */ + ViaSeqMask(hwp, 0x2D, 0x30, 0x30); + + DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Exiting viaIGA1Init.\n")); +} + void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode) { @@ -2344,6 +2405,7 @@ iga1_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode, viaIGA1DPMSControl(pScrn, 0x03); viaIGAInitCommon(pScrn); + viaIGA1Init(pScrn); ViaCRTCInit(pScrn); /* Turn off Screen */ diff --git a/src/via_ums.h b/src/via_ums.h index 18da726..da2e51f 100644 --- a/src/via_ums.h +++ b/src/via_ums.h @@ -217,6 +217,7 @@ void ViaDisplayDisableSimultaneous(ScrnInfoPtr pScrn); void ViaGammaDisable(ScrnInfoPtr pScrn); void ViaCRTCInit(ScrnInfoPtr pScrn); void viaIGAInitCommon(ScrnInfoPtr pScrn); +void viaIGA1Init(ScrnInfoPtr pScrn); void viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y); void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode); void viaIGA1Save(ScrnInfoPtr pScrn);
_______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel