configure.ac | 2
src/via_display.c | 115 ++++++++++++++++++++++++------------------------------
src/via_driver.h | 1
src/via_ums.h | 5 --
4 files changed, 54 insertions(+), 69 deletions(-)
New commits:
commit aa6d4d53adcb15ba4bb4f46952b203148a9a78d4
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 2 07:12:41 2016 -0700
Version bumped to 0.4.161
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 6f08897..c7dbad9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.160],
+ [0.4.161],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit df26d0cc1a38961cbab02f6cc69702f15ab371ee
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 2 07:06:03 2016 -0700
Discontinuing functions related to simultaneous display
Discontinuing ViaDisplayEnableSimultaneous and
ViaDisplayDisableSimultaneous functions. These two functions are
no longer used since the display device driver already has the
capability to control two display controllers.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_display.c b/src/via_display.c
index fd6d3fe..c0e5cb1 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -120,32 +120,6 @@ viaDisplayInit(ScrnInfoPtr pScrn)
}
/*
- * Enables simultaneous mode.
- */
-void
-ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "ViaDisplayEnableSimultaneous\n"));
- ViaCrtcMask(hwp, 0x6B, 0x08, 0x08);
-}
-
-/*
- * Disables simultaneous mode.
- */
-void
-ViaDisplayDisableSimultaneous(ScrnInfoPtr pScrn)
-{
- vgaHWPtr hwp = VGAHWPTR(pScrn);
-
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "ViaDisplayDisableSimultaneous\n"));
- ViaCrtcMask(hwp, 0x6B, 0x00, 0x08);
-}
-
-/*
* Sets the primary or secondary display stream on internal TMDS.
*/
void
@@ -2471,30 +2445,18 @@ iga1_crtc_dpms(xf86CrtcPtr crtc, int mode)
switch (mode) {
case DPMSModeOn:
viaIGA1DPMSControl(pScrn, 0x00);
-
- if (pBIOSInfo->SimultaneousEnabled)
- ViaDisplayEnableSimultaneous(pScrn);
break;
case DPMSModeStandby:
viaIGA1DPMSControl(pScrn, 0x01);
-
- if (pBIOSInfo->SimultaneousEnabled)
- ViaDisplayDisableSimultaneous(pScrn);
break;
case DPMSModeSuspend:
viaIGA1DPMSControl(pScrn, 0x02);
-
- if (pBIOSInfo->SimultaneousEnabled)
- ViaDisplayDisableSimultaneous(pScrn);
break;
case DPMSModeOff:
viaIGA1DPMSControl(pScrn, 0x03);
-
- if (pBIOSInfo->SimultaneousEnabled)
- ViaDisplayDisableSimultaneous(pScrn);
break;
default:
@@ -2689,11 +2651,6 @@ iga1_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
/* Turn on Screen */
ViaCrtcMask(hwp, 0x17, 0x80, 0x80);
- if (pVia->pBIOSInfo->SimultaneousEnabled)
- ViaDisplayEnableSimultaneous(pScrn);
- else
- ViaDisplayDisableSimultaneous(pScrn);
-
iga1_crtc_set_origin(crtc, crtc->x, crtc->y);
/* Turn on IGA1 now that mode setting is done. */
@@ -2968,18 +2925,12 @@ iga2_crtc_dpms(xf86CrtcPtr crtc, int mode)
switch (mode) {
case DPMSModeOn:
viaIGA2DisplayOutput(pScrn, TRUE);
-
- if (pBIOSInfo->SimultaneousEnabled)
- ViaDisplayEnableSimultaneous(pScrn);
break;
case DPMSModeStandby:
case DPMSModeSuspend:
case DPMSModeOff:
viaIGA2DisplayOutput(pScrn, FALSE);
-
- if (pBIOSInfo->SimultaneousEnabled)
- ViaDisplayDisableSimultaneous(pScrn);
break;
default:
@@ -3132,11 +3083,6 @@ iga2_crtc_mode_set(xf86CrtcPtr crtc, DisplayModePtr mode,
viaIGA2DisplayChannel(pScrn, TRUE);
- if (pVia->pBIOSInfo->SimultaneousEnabled)
- ViaDisplayEnableSimultaneous(pScrn);
- else
- ViaDisplayDisableSimultaneous(pScrn);
-
iga2_crtc_set_origin(crtc, crtc->x, crtc->y);
/* Turn on IGA2 now that mode setting is done. */
diff --git a/src/via_driver.h b/src/via_driver.h
index c2684d5..1b67738 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -516,6 +516,5 @@ void viaHideCursor(ScrnInfoPtr pScrn);
Bool viaHWCursorInit(ScreenPtr pScreen);
void ViaDisplaySetStreamOnCRT(ScrnInfoPtr pScrn, Bool primary);
void ViaDisplaySetStreamOnDFP(ScrnInfoPtr pScrn, Bool primary);
-void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);
#endif /* _VIA_DRIVER_H_ */
diff --git a/src/via_ums.h b/src/via_ums.h
index ad249f1..8bf8cf9 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -154,9 +154,6 @@ typedef struct _VIABIOSINFO {
Bool ClockExternal;
CARD32 Bandwidth; /* available memory bandwidth */
- /* Simultaneous */
- Bool SimultaneousEnabled;
-
/* TV entries */
int TVEncoder;
int TVOutput;
@@ -212,8 +209,6 @@ void viaIGA1DPMSControl(ScrnInfoPtr pScrn, CARD8
DPMS_Control);
void viaIGA2DisplayOutput(ScrnInfoPtr pScrn, Bool OutputEnable);
void viaIGA2DisplayChannel(ScrnInfoPtr pScrn, Bool Channel_State);
void viaDisplayInit(ScrnInfoPtr pScrn);
-void ViaDisplayEnableSimultaneous(ScrnInfoPtr pScrn);
-void ViaDisplayDisableSimultaneous(ScrnInfoPtr pScrn);
void ViaGammaDisable(ScrnInfoPtr pScrn);
void ViaCRTCInit(ScrnInfoPtr pScrn);
void viaIGAInitCommon(ScrnInfoPtr pScrn);
commit 3e512ac6db2661d74405872fd935c161032638ca
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Thu Jun 2 06:50:14 2016 -0700
Moved IGA1 initialization code away from viaIGA1SetDisplayRegister
Moved IGA1 initialization code from viaIGA1SetDisplayRegister
function to viaIGA1Init function. These functions are 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 653ea7b..fd6d3fe 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -580,6 +580,57 @@ viaIGA1Init(ScrnInfoPtr pScrn)
* 11: PLL on/off according to the PMS */
ViaSeqMask(hwp, 0x2D, 0x30, 0x30);
+ /* 3X5.32[7:5] - HSYNC Delay Number by VCLK
+ * 000: No delay
+ * 001: Delay + 4 VCKs
+ * 010: Delay + 8 VCKs
+ * 011: Delay + 12 VCKs
+ * 100: Delay + 16 VCKs
+ * 101: Delay + 20 VCKs
+ * Others: Undefined
+ * 3X5.32[4] - Reserved
+ * 3X5.32[3] - CRT SYNC Driving Selection
+ * 0: Low
+ * 1: High
+ * 3X5.32[2] - Display End Blanking Enable
+ * 0: Disable
+ * 1: Enable
+ * 3X5.32[1] - Digital Video Port (DVP) Gamma Correction
+ * If the gamma correction of primary display is
+ * turned on, the gamma correction in DVP can be
+ * enabled / disabled by this bit.
+ * 0: Disable
+ * 1: Enable
+ * 3X5.32[0] - Real-Time Flipping
+ * 0: Flip by the frame
+ * 1: Flip by each scan line */
+ ViaCrtcMask(hwp, 0x32, 0x00, 0xEF);
+
+ /*
+ * 3X5.33[7] - Primary Display Gamma Correction
+ * 0: Disable
+ * 1: Enable
+ * 3X5.33[6] - Primary Display Interlace Mode
+ * 0: Disable
+ * 1: Enable
+ * 3X5.33[5] - Horizontal Blanking End Bit [6]
+ * 3X5.33[4] - Horizontal Synchronization Start Bit [8]
+ * 3X5.33[3] - Prefetch Mode
+ * 0: Disable
+ * 1: Enable
+ * 3X5.33[2:0] - The Value will Shift the HSYNC to be Early than Planned
+ * 000: Shift to early time by 3 characters
+ * (VGA mode suggested value; default value)
+ * 001: Shift to early time by 4 characters
+ * 010: Shift to early time by 5 characters
+ * 011: Shift to early time by 6 characters
+ * 100: Shift to early time by 7 characters
+ * 101: Shift to early time by 0 character
+ * (Non-VGA mode suggested value)
+ * 110: Shift to early time by 1 character
+ * 111: Shift to early time by 2 characters */
+ ViaCrtcMask(hwp, 0x33, 0x00, 0xCF);
+
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting viaIGA1Init.\n"));
}
@@ -702,7 +753,7 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr
mode)
* 3X5.32[0] - Real-Time Flipping
* 0: Flip by the frame
* 1: Flip by each scan line */
- ViaCrtcMask(hwp, 0x32, 0x00, 0xED);
+ ViaCrtcMask(hwp, 0x32, 0x00, 0xEC);
/*
* 3X5.33[7] - Primary Display Gamma Correction
@@ -727,7 +778,7 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr
mode)
* (Non-VGA mode suggested value)
* 110: Shift to early time by 1 character
* 111: Shift to early time by 2 characters */
- ViaCrtcMask(hwp, 0x33, 0x00, 0x48);
+ ViaCrtcMask(hwp, 0x33, 0x00, 0x4F);
/* Set IGA1 to linear mode */
/* 3X5.43[2] - IGA1 Address Mode Selection
@@ -735,12 +786,6 @@ viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn,
DisplayModePtr mode)
* 1: Tile */
ViaCrtcMask(hwp, 0x43, 0x00, 0x04);
- /* Disable IGA1 gamma correction. */
- ViaCrtcMask(hwp, 0x33, 0x00, 0x80);
-
- /* Disable DVP gamma correction */
- ViaCrtcMask(hwp, 0x32, 0x00, 0x02);
-
/* Set IGA1 horizontal total.*/
/* Due to IGA1 horizontal total being only 9 bits wide,
_______________________________________________
Openchrome-devel mailing list
Openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
