[Openchrome-devel] xf86-video-openchrome: 6 commits - configure.ac src/via_display.c src/via_ums.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sat Jun 4 15:57:32 UTC 2016
configure.ac | 2 +-
src/via_display.c | 28 ++++++++++++++++------------
src/via_ums.c | 2 +-
3 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit cbd42e02b1c179056567fd43068c0a4c05e6f5a5
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 08:57:06 2016 -0700
Version bumped to 0.4.169
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index c865aee..90e7358 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.168],
+ [0.4.169],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit fbd7ee6809ee864f3de40e39cf6fba17104ac4fa
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 08:48:37 2016 -0700
Fixing a mishandling of starting address for IGA1
CR48 was not being handled correctly.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index 57f10d3..513d09f 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -641,9 +641,8 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
hwp->writeCrtc(hwp, 0x0D, Base & 0xFF);
hwp->writeCrtc(hwp, 0x0C, (Base & 0xFF00) >> 8);
- /* FIXME The proper starting address for CR48 is 0x1F - Bits[28:24] */
if (!(pVia->Chipset == VIA_CLE266 && CLE266_REV_IS_AX(pVia->ChipRev))) {
- ViaCrtcMask(hwp, 0x48, Base >> 24, 0x0F);
+ ViaCrtcMask(hwp, 0x48, Base >> 24, 0x1F);
}
/* CR34 are fire bits. Must be written after CR0C, CR0D, and CR48. */
commit 564b53dcd0fc5afcb08b9fb0d2d3b672bccdcd77
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 08:44:49 2016 -0700
Making sure certain revisions of CLE266 does not deal with CR48
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index ed6112b..57f10d3 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -653,7 +653,9 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
cr0d = hwp->readCrtc(hwp, 0x0D);
cr0c = hwp->readCrtc(hwp, 0x0C);
cr34 = hwp->readCrtc(hwp, 0x34);
- cr48 = hwp->readCrtc(hwp, 0x48);
+ if (!(pVia->Chipset == VIA_CLE266 && CLE266_REV_IS_AX(pVia->ChipRev))) {
+ cr48 = hwp->readCrtc(hwp, 0x48);
+ }
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"CR0D: 0x%02X\n", cr0d));
@@ -661,8 +663,11 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
"CR0C: 0x%02X\n", cr0c));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"CR34: 0x%02X\n", cr34));
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "CR48: 0x%02X\n", cr48));
+ if (!(pVia->Chipset == VIA_CLE266 && CLE266_REV_IS_AX(pVia->ChipRev))) {
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "CR48: 0x%02X\n", cr48));
+ }
+
#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
commit e9a1e44492cf54167085c0d1ba8a463f2ca9630c
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 08:32:29 2016 -0700
Minor tweaks to viaIGA2SetFBStartingAddress debug messages
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index 660c819..ed6112b 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -1766,13 +1766,13 @@ viaIGA2SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
cra3 = hwp->readCrtc(hwp, 0xA3);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "CR62: 0x%02x\n", cr62));
+ "CR62: 0x%02X\n", cr62));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "CR63: 0x%02x\n", cr63));
+ "CR63: 0x%02X\n", cr63));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "CR64: 0x%02x\n", cr64));
+ "CR64: 0x%02X\n", cr64));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "CRA3: 0x%02x\n", cra3));
+ "CRA3: 0x%02X\n", cra3));
#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
commit e850740027b80a39a22475ba0b42936d40be7efb
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 08:31:20 2016 -0700
Minor tweaks to viaIGA1SetFBStartingAddress debug messages
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index e7c9da5..660c819 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -656,13 +656,13 @@ viaIGA1SetFBStartingAddress(xf86CrtcPtr crtc, int x, int y)
cr48 = hwp->readCrtc(hwp, 0x48);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "CR0D: 0x%02x\n", cr0d));
+ "CR0D: 0x%02X\n", cr0d));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "CR0C: 0x%02x\n", cr0c));
+ "CR0C: 0x%02X\n", cr0c));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "CR34: 0x%02x\n", cr34));
+ "CR34: 0x%02X\n", cr34));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "CR48: 0x%02x\n", cr48));
+ "CR48: 0x%02X\n", cr48));
#endif
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
commit 7db10c37d731e53117de8bb221bc5eba20c5fd81
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Sat Jun 4 08:26:54 2016 -0700
Updating via_ums.c copyright
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index f584986..e8542d6 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2016 The Openchrome Project
+ * Copyright 2011-2016 The OpenChrome Project
* [http://www.freedesktop.org/wiki/Openchrome]
*
* Permission is hereby granted, free of charge, to any person obtaining a
More information about the Openchrome-devel
mailing list