configure.ac | 2 +-
src/via_display.c | 30 +++++++++++-------------------
src/via_ums.h | 1 -
3 files changed, 12 insertions(+), 21 deletions(-)
New commits:
commit 28b53943be81c4fe5c8600fb4873f92f411d283c
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sun Apr 17 19:11:49 2016 -0700
Version bumped to 0.4.120
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 3c3fd7c..ce3f2af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.119],
+ [0.4.120],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 9fdf7dc22a00d393688a458284df00ff09ce1e89
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Sun Apr 17 19:07:47 2016 -0700
Discontinuing ViaSecondCRTCHorizontalOffset
The code within this function was transferred to viaIGA2SetDisplayRegister
function 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 c77eebf..c4c8a39 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -628,24 +628,6 @@ ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int
width)
}
void
-ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
- CARD16 temp;
-
- /* offset */
- temp = (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)) >> 3;
- /* Make sure that this is 32-byte aligned. */
- if (temp & 0x03) {
- temp += 0x03;
- temp &= ~0x03;
- }
-
- hwp->writeCrtc(hwp, 0x66, temp & 0xFF);
- ViaCrtcMask(hwp, 0x67, temp >> 8, 0x03);
-}
-
-void
viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
VIAPtr pVia = VIAPTR(pScrn);
@@ -763,6 +745,17 @@ viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn,
DisplayModePtr mode)
temp = mode->CrtcVSyncEnd;
ViaCrtcMask(hwp, 0x5F, temp, 0x1F);
+ /* offset */
+ temp = (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)) >> 3;
+ /* Make sure that this is 32-byte aligned. */
+ if (temp & 0x03) {
+ temp += 0x03;
+ temp &= ~0x03;
+ }
+
+ hwp->writeCrtc(hwp, 0x66, temp & 0xFF);
+ ViaCrtcMask(hwp, 0x67, temp >> 8, 0x03);
+
switch (pVia->ChipId) {
case VIA_CX700:
case VIA_K8M890:
@@ -779,7 +772,6 @@ viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr
mode)
break;
}
- ViaSecondCRTCHorizontalOffset(pScrn);
ViaSecondCRTCHorizontalQWCount(pScrn, mode->CrtcHDisplay);
}
diff --git a/src/via_ums.h b/src/via_ums.h
index 1d2439c..2f0536e 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -215,7 +215,6 @@ void viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x,
int y);
void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
void viaIGA1SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
void viaIGA2SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y);
-void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
void viaIGA2SetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
