configure.ac | 2 +-
src/via_display.c | 52 ++++++++++++++++++++++++++--------------------------
src/via_ums.h | 2 +-
3 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 6e35428886f6ac73548865f1b635a0812e032b28
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Apr 15 15:12:30 2016 -0700
Version bumped to 0.4.117
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 759f614..1578903 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.116],
+ [0.4.117],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 57bb84132fa504158e665c913c4284e8ea9af883
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Apr 15 15:06:10 2016 -0700
Moving ViaModeSecondCRTC location
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 42240b2..9a68518 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -587,30 +587,6 @@ ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn)
}
void
-ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{
- VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
- vgaHWPtr hwp = VGAHWPTR(pScrn);
- DisplayModePtr realMode = mode;
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeSecondCRTC\n"));
-
- viaIGA2SetDisplayRegister(pScrn, realMode);
- ViaSetSecondaryFIFO(pScrn, realMode);
- pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, realMode);
-
- /* Fix LCD scaling */
- ViaSecondCRTCHorizontalQWCount(pScrn, mode->CrtcHDisplay);
-
- pBIOSInfo->ClockExternal = FALSE;
- ViaSetSecondaryDotclock(pScrn, pBIOSInfo->Clock);
- ViaSetUseExternalClock(hwp);
-
- hwp->disablePalette(hwp);
-}
-
-void
viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
VIAPtr pVia = VIAPTR(pScrn);
@@ -748,6 +724,30 @@ viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn,
DisplayModePtr mode)
ViaSecondCRTCHorizontalQWCount(pScrn, mode->CrtcHDisplay);
}
+void
+ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
+{
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+ DisplayModePtr realMode = mode;
+
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeSecondCRTC\n"));
+
+ viaIGA2SetDisplayRegister(pScrn, realMode);
+ ViaSetSecondaryFIFO(pScrn, realMode);
+ pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, realMode);
+
+ /* Fix LCD scaling */
+ ViaSecondCRTCHorizontalQWCount(pScrn, mode->CrtcHDisplay);
+
+ pBIOSInfo->ClockExternal = FALSE;
+ ViaSetSecondaryDotclock(pScrn, pBIOSInfo->Clock);
+ ViaSetUseExternalClock(hwp);
+
+ hwp->disablePalette(hwp);
+}
+
/*
* Checks for limitations imposed by the available VGA timing registers.
*/
diff --git a/src/via_ums.h b/src/via_ums.h
index d0b11ea..906f47e 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -211,8 +211,8 @@ void ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr
mode);
void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
-void ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaGammaDisable(ScrnInfoPtr pScrn);
commit 150bd63ca3b0bce2b83f8b449c01f43ead386941
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Fri Apr 15 15:00:11 2016 -0700
Changing ViaSecondCRTCSetMode to viaIGA2SetDisplayRegister
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 a5b0e0d..42240b2 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -596,7 +596,7 @@ ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeSecondCRTC\n"));
- ViaSecondCRTCSetMode(pScrn, realMode);
+ viaIGA2SetDisplayRegister(pScrn, realMode);
ViaSetSecondaryFIFO(pScrn, realMode);
pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, realMode);
@@ -611,7 +611,7 @@ ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
}
void
-ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
+viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
VIAPtr pVia = VIAPTR(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
@@ -622,7 +622,7 @@ ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "mode->name: %s\n", mode->name);
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaSecondCRTCSetMode\n"));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaIGA2SetDisplayRegister\n"));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting up %s\n", mode->name));
/* bpp */
switch (pScrn->bitsPerPixel) {
diff --git a/src/via_ums.h b/src/via_ums.h
index 12cd572..d0b11ea 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -212,7 +212,7 @@ void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int
x, int y);
void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
void ViaModeSecondCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
-void ViaSecondCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaGammaDisable(ScrnInfoPtr pScrn);
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
