[openchrome-devel] xf86-video-openchrome: Branch 'main' - 4 commits - configure.ac .gitignore src/Makefile.am src/via_tmds.c
Kevin Brace
kevinbrace at kemper.freedesktop.org
Mon Sep 21 16:09:03 UTC 2020
.gitignore | 1 -
configure.ac | 2 +-
src/Makefile.am | 5 +++--
src/via_tmds.c | 24 ++++++++++++++++--------
4 files changed, 20 insertions(+), 12 deletions(-)
New commits:
commit 16ac301c869ccccf61925ce0c3934064a940c3d9
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Sep 21 09:08:30 2020 -0700
Version bumped to 0.6.315
Fixes "make distcheck" build issue.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 806b993..34ddc15 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-openchrome],
- [0.6.314],
+ [0.6.315],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 0083f076a84c63b969693da0e5edc0216f977ea4
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Sep 21 08:57:37 2020 -0700
Eliminate unused variable compilation warnings caused by src/via_tmds.c
This commit fixes the issue that happen during a regular build.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_tmds.c b/src/via_tmds.c
index 752dcbb..40efabc 100644
--- a/src/via_tmds.c
+++ b/src/via_tmds.c
@@ -209,7 +209,7 @@ viaTMDSIOPadSetting(ScrnInfoPtr pScrn, Bool ioPadOn)
vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
- CARD8 sr12, sr13, sr5a;
+ CARD8 sr13, sr5a;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaTMDSIOPadSetting.\n"));
@@ -221,9 +221,6 @@ viaTMDSIOPadSetting(ScrnInfoPtr pScrn, Bool ioPadOn)
"Setting 3C5.5A[0] to 0.\n"));
ViaSeqMask(hwp, 0x5A, sr5a & 0xFE, 0x01);
- sr12 = hwp->readSeq(hwp, 0x12);
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "SR12: 0x%02X\n", sr12));
sr13 = hwp->readSeq(hwp, 0x13);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"SR13: 0x%02X\n", sr13));
@@ -749,7 +746,9 @@ viaExtTMDSSetDataDriveStrength(ScrnInfoPtr pScrn, CARD8 dataDriveStrength)
static void
via_tmds_create_resources(xf86OutputPtr output)
{
+#ifdef HAVE_DEBUG
ScrnInfoPtr pScrn = output->scrn;
+#endif /* HAVE_DEBUG */
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_tmds_create_resources.\n"));
@@ -788,7 +787,9 @@ via_tmds_dpms(xf86OutputPtr output, int mode)
static void
via_tmds_save(xf86OutputPtr output)
{
+#ifdef HAVE_DEBUG
ScrnInfoPtr pScrn = output->scrn;
+#endif /* HAVE_DEBUG */
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_tmds_save.\n"));
@@ -800,7 +801,9 @@ via_tmds_save(xf86OutputPtr output)
static void
via_tmds_restore(xf86OutputPtr output)
{
+#ifdef HAVE_DEBUG
ScrnInfoPtr pScrn = output->scrn;
+#endif /* HAVE_DEBUG */
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_tmds_restore.\n"));
@@ -833,7 +836,9 @@ static Bool
via_tmds_mode_fixup(xf86OutputPtr output, DisplayModePtr mode,
DisplayModePtr adjusted_mode)
{
+#ifdef HAVE_DEBUG
ScrnInfoPtr pScrn = output->scrn;
+#endif /* HAVE_DEBUG */
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_tmds_mode_fixup.\n"));
@@ -943,7 +948,9 @@ static Bool
via_tmds_set_property(xf86OutputPtr output, Atom property,
RRPropertyValuePtr value)
{
+#ifdef HAVE_DEBUG
ScrnInfoPtr pScrn = output->scrn;
+#endif /* HAVE_DEBUG */
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_tmds_set_property.\n"));
@@ -958,7 +965,9 @@ via_tmds_set_property(xf86OutputPtr output, Atom property,
static Bool
via_tmds_get_property(xf86OutputPtr output, Atom property)
{
+#ifdef HAVE_DEBUG
ScrnInfoPtr pScrn = output->scrn;
+#endif /* HAVE_DEBUG */
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_tmds_get_property.\n"));
@@ -972,7 +981,9 @@ via_tmds_get_property(xf86OutputPtr output, Atom property)
static void
via_tmds_destroy(xf86OutputPtr output)
{
+#ifdef HAVE_DEBUG
ScrnInfoPtr pScrn = output->scrn;
+#endif /* HAVE_DEBUG */
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered via_tmds_destroy.\n"));
@@ -1090,7 +1101,7 @@ viaExtTMDSProbe(ScrnInfoPtr pScrn)
vgaHWPtr hwp = VGAHWPTR(pScrn);
VIAPtr pVia = VIAPTR(pScrn);
VIADisplayPtr pVIADisplay = pVia->pVIADisplay;
- CARD8 sr12, sr13;
+ CARD8 sr12;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered viaExtTMDSProbe.\n"));
@@ -1132,11 +1143,8 @@ viaExtTMDSProbe(ScrnInfoPtr pScrn)
}
sr12 = hwp->readSeq(hwp, 0x12);
- sr13 = hwp->readSeq(hwp, 0x13);
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"SR12: 0x%02X\n", sr12));
- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "SR13: 0x%02X\n", sr13));
if (pVIADisplay->extTMDSPresence) {
switch (pVia->Chipset) {
case VIA_CLE266:
commit e47a59dfacddc09e846400f88bba47afb4492683
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Sep 21 08:57:03 2020 -0700
Add a few missing header files to EXTRA_DIST
The file in question here is src/Makefile.am. This fixes
"make distcheck" build failure.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index b1251fe..865194c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,9 +77,11 @@ EXTRA_DIST = \
via_3d_reg.h \
via_ch7xxx.h \
via_dmabuffer.h \
+ via_dri.h \
via_driver.h \
+ via_drmclient.h \
via_eng_regs.h \
- via_fp.c \
+ via_fp.h \
via_memmgr.h \
via_regs.h \
via_rop.h \
commit 2fa4a93faa1e64a2e3e7c3e7132894cf7ab7bf4d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Mon Sep 21 08:56:41 2020 -0700
Remove remnants of version.h
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/.gitignore b/.gitignore
index fa1b356..9a85256 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,3 @@ ltmain.sh
missing
stamp-h1
ChangeLog
-version.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 26fbe82..b1251fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,6 @@ openchrome_drv_la_SOURCES = \
EXTRA_DIST = \
compat-api.h \
drmmode_display.h \
- version.h \
via_3d.h \
via_3d_reg.h \
via_ch7xxx.h \
More information about the openchrome-devel
mailing list