[Openchrome-devel] xf86-video-openchrome: 6 commits - configure.ac src/via_display.c src/via_outputs.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Thu May 26 00:20:24 UTC 2016
configure.ac | 2 +-
src/via_display.c | 36 +++++++++++++++++++++++++++---------
src/via_outputs.c | 1 -
3 files changed, 28 insertions(+), 11 deletions(-)
New commits:
commit 620cd85f2c15c9359d0dda2caee46987f0e0477c
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Wed May 25 17:19:55 2016 -0700
Version bumped to 0.4.157
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 9caea82..d9b12e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.156],
+ [0.4.157],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 3309f1822984fe150fc227d0b0e859788eb823ac
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Wed May 25 16:56:31 2016 -0700
Removing unnecessary code that sets starting address of IGA1
Since the frame buffer starting address of IGA1 can be specified
separately by viaIGA1SetFBStartingAddress function, there is no
need to specify this within viaIGA1SetDisplayRegister function.
Both of these functions 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 3e73749..325698e 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -811,12 +811,6 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
ViaCrtcMask(hwp, 0x35, temp >> 8, 0x04);
- /* Primary starting address -> 0x00, adjustframe does the rest */
- hwp->writeCrtc(hwp, 0x0C, 0x00);
- hwp->writeCrtc(hwp, 0x0D, 0x00);
- ViaCrtcMask(hwp, 0x48, 0x00, 0x03); /* is this even possible on CLE266A ? */
- hwp->writeCrtc(hwp, 0x34, 0x00);
-
/* vertical sync start : 2047 */
temp = mode->CrtcVSyncStart;
hwp->writeCrtc(hwp, 0x10, temp & 0xFF);
commit e712b398ee6b690a62351cdcfc7f44185453fdb1
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Wed May 25 16:49:20 2016 -0700
Cleanup of the code that sets IGA1 vertical display end
viaIGA1SetDisplayRegister function contains the code in question.
This function is 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 cc5997a..3e73749 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -791,13 +791,26 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
ViaCrtcMask(hwp, 0x35, temp >> 10, 0x01);
- /* vertical address : 2048 */
+ /* Set IGA1 vertical display end. */
+ /* Vertical display end requires the value to be 1 less
+ * than the actual value being written. */
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "IGA1 CrtcVDisplay: %d\n", mode->CrtcVDisplay));
temp = mode->CrtcVDisplay - 1;
+
+ /* 3X5.12[7:0] - Vertical Active Data Period Bits [7:0] */
hwp->writeCrtc(hwp, 0x12, temp & 0xFF);
+
+ /* 3X5.07[1] - Vertical Active Data Period Bit [8] */
ViaCrtcMask(hwp, 0x07, temp >> 7, 0x02);
+
+ /* 3X5.07[6] - Vertical Active Data Period Bit [9] */
ViaCrtcMask(hwp, 0x07, temp >> 3, 0x40);
+
+ /* 3X5.35[2] - Vertical Active Data Period Bit [10] */
ViaCrtcMask(hwp, 0x35, temp >> 8, 0x04);
+
/* Primary starting address -> 0x00, adjustframe does the rest */
hwp->writeCrtc(hwp, 0x0C, 0x00);
hwp->writeCrtc(hwp, 0x0D, 0x00);
commit ba8d9f0092339f1e49f05564b2b6f7c4d03514c0
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Wed May 25 16:46:18 2016 -0700
Cleanup of the code that sets IGA1 vertical total
viaIGA1SetDisplayRegister function contains the code in question.
This function is 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 e7ae917..cc5997a 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -771,13 +771,26 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
ViaCrtcMask(hwp, 0x05, temp, 0x1F);
- /* vertical total : 2049 */
+ /* Set IGA1 vertical total. */
+ /* Vertical total requires the value to be 2 less
+ * than the actual value being written. */
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "IGA1 CrtcVTotal: %d\n", mode->CrtcVTotal));
temp = mode->CrtcVTotal - 2;
+
+ /* 3X5.06[7:0] - Vertical Total Period Bits [7:0] */
hwp->writeCrtc(hwp, 0x06, temp & 0xFF);
+
+ /* 3X5.07[0] - Vertical Total Period Bit [8] */
ViaCrtcMask(hwp, 0x07, temp >> 8, 0x01);
+
+ /* 3X5.07[5] - Vertical Total Period Bit [9] */
ViaCrtcMask(hwp, 0x07, temp >> 4, 0x20);
+
+ /* 3X5.35[0] - Vertical Total Period Bit [10] */
ViaCrtcMask(hwp, 0x35, temp >> 10, 0x01);
+
/* vertical address : 2048 */
temp = mode->CrtcVDisplay - 1;
hwp->writeCrtc(hwp, 0x12, temp & 0xFF);
commit 7cf973401d757886a56a92d9bd3c81e5c218812a
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue May 24 03:15:39 2016 -0700
Removing a non-existent function called ViaModeSecondCRTC
This function was being called from via_dvi_mode_set function
located inside via_outputs.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_outputs.c b/src/via_outputs.c
index 6b64695..133ee4a 100644
--- a/src/via_outputs.c
+++ b/src/via_outputs.c
@@ -857,7 +857,6 @@ via_dvi_mode_set(xf86OutputPtr output, DisplayModePtr mode,
vgaHWPtr hwp = VGAHWPTR(pScrn);
via_vt1632_power(output, FALSE);
- ViaModeSecondCRTC(pScrn, mode);
via_vt1632_mode_set(output, mode, adjusted_mode);
via_vt1632_power(output, TRUE);
}
commit c3cc925cc175e9faca28df159d6f489b1710e305
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue May 24 03:12:42 2016 -0700
Removing unnecessary write to SR15 (3C5.15)
This was happening within viaIGA1SetDisplayRegister function.
This function is 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 9ebbc36..e7ae917 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -623,8 +623,6 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
hwp->writeSeq(hwp, 0x03, 0x00);
hwp->writeSeq(hwp, 0x04, 0x0E);
- ViaSeqMask(hwp, 0x15, 0x02, 0x02);
-
/* Set the color depth for IGA1. */
switch (pScrn->bitsPerPixel) {
case 8:
More information about the Openchrome-devel
mailing list