[Openchrome-devel] xf86-video-openchrome: 4 commits - configure.ac src/via_display.c src/via_outputs.c src/via_ums.h
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Apr 15 00:48:19 UTC 2016
configure.ac | 2 +-
src/via_display.c | 40 ++++++++++++++++++++++++++++++++++++++--
src/via_outputs.c | 36 ------------------------------------
src/via_ums.h | 2 +-
4 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit f00732b87730bb7a4d227c2d4deb0e2bed53d5d6
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Apr 14 17:47:34 2016 -0700
Version bumped to 0.4.114
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 4e7e416..c3ad780 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.113],
+ [0.4.114],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 609d5cf6d8c2ff06cee0b562f361cc9a858d652d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Apr 14 17:44:56 2016 -0700
Moving ViaModeFirstCRTC from via_outputs.c to via_display.c
This function really belongs inside via_display.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index c1d3630..974c9fc 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -252,6 +252,42 @@ ViaCRTCInit(ScrnInfoPtr pScrn)
}
void
+ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
+{
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeFirstCRTC\n");
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+
+ /* Turn off Screen */
+ ViaCrtcMask(hwp, 0x17, 0x00, 0x80);
+
+ /* Disable IGA1 */
+ ViaSeqMask(hwp, 0x59, 0x00, 0x80);
+
+ ViaFirstCRTCSetMode(pScrn, mode);
+ pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, mode);
+ pBIOSInfo->ClockExternal = FALSE;
+
+ /* Enable Extended Mode Memory Access. */
+ ViaSeqMask(hwp, 0x1A, 0x08, 0x08);
+
+ ViaSetPrimaryFIFO(pScrn, mode);
+
+ ViaSetPrimaryDotclock(pScrn, pBIOSInfo->Clock);
+ ViaSetUseExternalClock(hwp);
+ ViaCrtcMask(hwp, 0x6B, 0x00, 0x01);
+
+ hwp->disablePalette(hwp);
+
+ /* Enable IGA1 */
+ ViaSeqMask(hwp, 0x59, 0x80, 0x80);
+
+ /* Turn on Screen */
+ ViaCrtcMask(hwp, 0x17, 0x80, 0x80);
+}
+
+void
ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
vgaHWPtr hwp = VGAHWPTR(pScrn);
diff --git a/src/via_outputs.c b/src/via_outputs.c
index 4accfc1..4e0c97e 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -1325,42 +1325,6 @@ viaTMDSPower(ScrnInfoPtr pScrn, Bool On)
}
void
-ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeFirstCRTC\n");
- vgaHWPtr hwp = VGAHWPTR(pScrn);
- VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
-
- /* Turn off Screen */
- ViaCrtcMask(hwp, 0x17, 0x00, 0x80);
-
- /* Disable IGA1 */
- ViaSeqMask(hwp, 0x59, 0x00, 0x80);
-
- ViaFirstCRTCSetMode(pScrn, mode);
- pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, mode);
- pBIOSInfo->ClockExternal = FALSE;
-
- /* Enable Extended Mode Memory Access. */
- ViaSeqMask(hwp, 0x1A, 0x08, 0x08);
-
- ViaSetPrimaryFIFO(pScrn, mode);
-
- ViaSetPrimaryDotclock(pScrn, pBIOSInfo->Clock);
- ViaSetUseExternalClock(hwp);
- ViaCrtcMask(hwp, 0x6B, 0x00, 0x01);
-
- hwp->disablePalette(hwp);
-
- /* Enable IGA1 */
- ViaSeqMask(hwp, 0x59, 0x80, 0x80);
-
- /* Turn on Screen */
- ViaCrtcMask(hwp, 0x17, 0x80, 0x80);
-}
-
-void
ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
VIAPtr pVia = VIAPTR(pScrn);
diff --git a/src/via_ums.h b/src/via_ums.h
index e4f3ea8..80c47bd 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -199,7 +199,6 @@ void ViaTVRestore(ScrnInfoPtr pScrn);
void ViaTVPrintRegs(ScrnInfoPtr pScrn);
#endif
void ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
-void ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaSetPrimaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
void ViaSetSecondaryDotclock(ScrnInfoPtr pScrn, CARD32 clock);
void ViaSetUseExternalClock(vgaHWPtr hwp);
@@ -208,6 +207,7 @@ void ViaSetUseExternalClock(vgaHWPtr hwp);
Bool UMSCrtcInit(ScrnInfoPtr pScrn);
void ViaCRTCInit(ScrnInfoPtr pScrn);
void ViaFirstCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
+void ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
commit 1ad1309f88fb5054f7a15a10edef02c6f2ba2826
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Apr 14 17:04:43 2016 -0700
Version bumped to 0.4.113
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index df8f284..4e7e416 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.112],
+ [0.4.113],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 7ad40db50129326b96c885ec3157441db011ee70
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Apr 14 16:58:47 2016 -0700
Dropping an extern keyword from a declaration
Attaching an extern keyword when declaring iga1_crtc_funcs and
iga2_crtc_funcs was giving out a warning during compilation. The
declarations are located inside via_display.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index fc9b497..c1d3630 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -1207,7 +1207,7 @@ iga_crtc_destroy(xf86CrtcPtr crtc)
free(crtc->driver_private);
}
-extern const xf86CrtcFuncsRec iga1_crtc_funcs = {
+const xf86CrtcFuncsRec iga1_crtc_funcs = {
.dpms = iga1_crtc_dpms,
.save = iga1_crtc_save,
.restore = iga1_crtc_restore,
@@ -1610,7 +1610,7 @@ iga2_crtc_hide_cursor(xf86CrtcPtr crtc)
}
}
-extern const xf86CrtcFuncsRec iga2_crtc_funcs = {
+const xf86CrtcFuncsRec iga2_crtc_funcs = {
.dpms = iga2_crtc_dpms,
.save = iga2_crtc_save,
.restore = iga2_crtc_restore,
More information about the Openchrome-devel
mailing list