[Openchrome-devel] xf86-video-openchrome: 5 commits - configure.ac src/via_display.c src/via_lvds.c src/via_ums.h
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Apr 15 21:35:38 UTC 2016
configure.ac | 2 -
src/via_display.c | 76 +++++++++++++++++++++++++++---------------------------
src/via_lvds.c | 26 +++++++++---------
src/via_ums.h | 2 -
4 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit 627b150a5ea02247bba3541a2fcc75691158d0b0
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 15 14:33:23 2016 -0700
Moving ViaModeFirstCRTC location
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 6409d80..a5b0e0d 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -252,42 +252,6 @@ ViaCRTCInit(ScrnInfoPtr pScrn)
}
void
-ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
-{
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeFirstCRTC\n");
- vgaHWPtr hwp = VGAHWPTR(pScrn);
- VIAPtr pVia = VIAPTR(pScrn);
- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
-
- /* Turn off Screen */
- ViaCrtcMask(hwp, 0x17, 0x00, 0x80);
-
- /* Disable IGA1 */
- ViaSeqMask(hwp, 0x59, 0x00, 0x80);
-
- viaIGA1SetDisplayRegister(pScrn, mode);
- pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, mode);
- pBIOSInfo->ClockExternal = FALSE;
-
- /* Enable Extended Mode Memory Access. */
- ViaSeqMask(hwp, 0x1A, 0x08, 0x08);
-
- ViaSetPrimaryFIFO(pScrn, mode);
-
- ViaSetPrimaryDotclock(pScrn, pBIOSInfo->Clock);
- ViaSetUseExternalClock(hwp);
- ViaCrtcMask(hwp, 0x6B, 0x00, 0x01);
-
- hwp->disablePalette(hwp);
-
- /* Enable IGA1 */
- ViaSeqMask(hwp, 0x59, 0x80, 0x80);
-
- /* Turn on Screen */
- ViaCrtcMask(hwp, 0x17, 0x80, 0x80);
-}
-
-void
viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
vgaHWPtr hwp = VGAHWPTR(pScrn);
@@ -531,6 +495,42 @@ ViaFirstCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y)
}
void
+ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
+{
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaModeFirstCRTC\n");
+ vgaHWPtr hwp = VGAHWPTR(pScrn);
+ VIAPtr pVia = VIAPTR(pScrn);
+ VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo;
+
+ /* Turn off Screen */
+ ViaCrtcMask(hwp, 0x17, 0x00, 0x80);
+
+ /* Disable IGA1 */
+ ViaSeqMask(hwp, 0x59, 0x00, 0x80);
+
+ viaIGA1SetDisplayRegister(pScrn, mode);
+ pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, mode);
+ pBIOSInfo->ClockExternal = FALSE;
+
+ /* Enable Extended Mode Memory Access. */
+ ViaSeqMask(hwp, 0x1A, 0x08, 0x08);
+
+ ViaSetPrimaryFIFO(pScrn, mode);
+
+ ViaSetPrimaryDotclock(pScrn, pBIOSInfo->Clock);
+ ViaSetUseExternalClock(hwp);
+ ViaCrtcMask(hwp, 0x6B, 0x00, 0x01);
+
+ hwp->disablePalette(hwp);
+
+ /* Enable IGA1 */
+ ViaSeqMask(hwp, 0x59, 0x80, 0x80);
+
+ /* Turn on Screen */
+ ViaCrtcMask(hwp, 0x17, 0x80, 0x80);
+}
+
+void
ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y)
{
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
diff --git a/src/via_ums.h b/src/via_ums.h
index eb5a3c8..12cd572 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -206,8 +206,8 @@ void ViaSetUseExternalClock(vgaHWPtr hwp);
Bool UMSCrtcInit(ScrnInfoPtr pScrn);
void ViaCRTCInit(ScrnInfoPtr pScrn);
void ViaFirstCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
-void ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
commit da310b4f330ce0a7b5ad197c2690a8499772c138
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 15 14:25:55 2016 -0700
Changing ViaFirstCRTCSetMode to viaIGA1SetDisplayRegister
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 91c2c9d..6409d80 100644
--- a/src/via_display.c
+++ b/src/via_display.c
@@ -265,7 +265,7 @@ ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
/* Disable IGA1 */
ViaSeqMask(hwp, 0x59, 0x00, 0x80);
- ViaFirstCRTCSetMode(pScrn, mode);
+ viaIGA1SetDisplayRegister(pScrn, mode);
pBIOSInfo->Clock = ViaModeDotClockTranslate(pScrn, mode);
pBIOSInfo->ClockExternal = FALSE;
@@ -288,13 +288,13 @@ ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode)
}
void
-ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode)
+viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode)
{
vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
CARD16 temp;
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaFirstCRTCSetMode\n"));
+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "viaIGA1SetDisplayRegister\n"));
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting up %s\n", mode->name));
diff --git a/src/via_ums.h b/src/via_ums.h
index c11422a..eb5a3c8 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -207,7 +207,7 @@ Bool UMSCrtcInit(ScrnInfoPtr pScrn);
void ViaCRTCInit(ScrnInfoPtr pScrn);
void ViaFirstCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
void ViaModeFirstCRTC(ScrnInfoPtr pScrn, DisplayModePtr mode);
-void ViaFirstCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
+void viaIGA1SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
void ViaSecondCRTCSetStartingAddress(xf86CrtcPtr crtc, int x, int y);
void ViaSecondCRTCHorizontalOffset(ScrnInfoPtr pScrn);
void ViaSecondCRTCHorizontalQWCount(ScrnInfoPtr pScrn, int width);
commit 154219095daaeaf58dc9dedcabeacc1236e896b9
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 15 02:31:17 2016 -0700
Version bumped to 0.4.116
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index a64d2ad..759f614 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ(2.57)
AC_INIT([xf86-video-openchrome],
- [0.4.115],
+ [0.4.116],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 8ca5c7f7dda7c21ee7be32041bcad30ec9160d14
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 15 02:09:38 2016 -0700
Changed one of the input parameter name for ViaLCDPower
This function is located inside via_lvds.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_lvds.c b/src/via_lvds.c
index c716294..e5dccca 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -330,7 +330,7 @@ ViaLCDPowerSequence(vgaHWPtr hwp, VIALCDPowerSeqRec Sequence)
}
static void
-ViaLCDPower(xf86OutputPtr output, Bool On)
+ViaLCDPower(xf86OutputPtr output, Bool Power_On)
{
ViaPanelInfoPtr Panel = output->driver_private;
ScrnInfoPtr pScrn = output->scrn;
@@ -343,13 +343,13 @@ ViaLCDPower(xf86OutputPtr output, Bool On)
"Entered ViaLCDPower.\n"));
/* Enable LCD */
- if (On)
+ if (Power_On)
ViaCrtcMask(hwp, 0x6A, 0x08, 0x08);
else
ViaCrtcMask(hwp, 0x6A, 0x00, 0x08);
if (pBIOSInfo->LCDPower)
- pBIOSInfo->LCDPower(pScrn, On);
+ pBIOSInfo->LCDPower(pScrn, Power_On);
/* Find Panel Size Index for PowerSeq Table */
if (pVia->Chipset == VIA_CLE266) {
@@ -366,7 +366,7 @@ ViaLCDPower(xf86OutputPtr output, Bool On)
i = 2;
usleep(1);
- if (On)
+ if (Power_On)
ViaLCDPowerSequence(hwp, powerOn[i]);
else
ViaLCDPowerSequence(hwp, powerOff[i]);
@@ -374,7 +374,7 @@ ViaLCDPower(xf86OutputPtr output, Bool On)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Integrated LVDS Flat Panel Power: %s\n",
- On ? "On" : "Off");
+ Power_On ? "On" : "Off");
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting ViaLCDPower.\n"));
commit f5679f1d58153e402005372e60ed543bb25df374
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 15 01:58:33 2016 -0700
Changed one of the input parameter name for ViaLVDSPower
This function is located inside via_lvds.c.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_lvds.c b/src/via_lvds.c
index bd41e14..c716294 100644
--- a/src/via_lvds.c
+++ b/src/via_lvds.c
@@ -263,7 +263,7 @@ ViaLVDSPowerChannel(ScrnInfoPtr pScrn, Bool on)
}
static void
-ViaLVDSPower(ScrnInfoPtr pScrn, Bool on)
+ViaLVDSPower(ScrnInfoPtr pScrn, Bool Power_On)
{
VIAPtr pVia = VIAPTR(pScrn);
@@ -276,21 +276,21 @@ ViaLVDSPower(ScrnInfoPtr pScrn, Bool on)
switch (pVia->Chipset) {
case VIA_VX800:
case VIA_CX700:
- ViaLVDSSoftwarePowerFirstSequence(pScrn, on);
- ViaLVDSSoftwarePowerSecondSequence(pScrn, on);
+ ViaLVDSSoftwarePowerFirstSequence(pScrn, Power_On);
+ ViaLVDSSoftwarePowerSecondSequence(pScrn, Power_On);
break;
default:
- ViaLVDSHardwarePowerFirstSequence(pScrn, on);
- ViaLVDSHardwarePowerSecondSequence(pScrn, on);
+ ViaLVDSHardwarePowerFirstSequence(pScrn, Power_On);
+ ViaLVDSHardwarePowerSecondSequence(pScrn, Power_On);
break;
}
- ViaLVDSDFPPower(pScrn, on);
- ViaLVDSPowerChannel(pScrn, on);
+ ViaLVDSDFPPower(pScrn, Power_On);
+ ViaLVDSPowerChannel(pScrn, Power_On);
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Integrated LVDS Flat Panel Power: %s\n",
- on ? "On" : "Off");
+ Power_On ? "On" : "Off");
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting ViaLVDSPower.\n"));
More information about the Openchrome-devel
mailing list