configure.ac | 2 -
src/via_analog.c | 2 -
src/via_driver.c | 26 ++++++++++-------------
src/via_driver.h | 2 -
src/via_options.c | 26 -----------------------
src/via_tv.c | 5 ----
src/via_vgahw.c | 59 ------------------------------------------------------
src/via_vgahw.h | 7 ------
8 files changed, 14 insertions(+), 115 deletions(-)
New commits:
commit 8dc4cf170e79e1759caf2c57a3a17c8b913e0587
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon May 10 13:22:13 2021 -0700
Version bumped to 0.6.402
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 9a6646d..5ae93bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-openchrome],
- [0.6.401],
+ [0.6.402],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit efca44948bdf4811238e3f49b2b59c63dae155a6
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon May 10 13:21:56 2021 -0700
Discontinue undocumented PrintTVRegs option
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index 1102b78..e50cbfd 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1689,14 +1689,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
if (serverGeneration == 1)
xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
-#ifdef HAVE_DEBUG
- if (pVia->PrintTVRegs) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Printing TV registers.\n");
- ViaTVPrintRegs(pScrn);
- }
-#endif
-
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting %s.\n", __func__));
return TRUE;
diff --git a/src/via_driver.h b/src/via_driver.h
index 74c3c0c..d175069 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -361,7 +361,6 @@ typedef struct _VIA {
#ifdef HAVE_DEBUG
Bool disableXvBWCheck;
Bool DumpVGAROM;
- Bool PrintTVRegs;
#endif /* HAVE_DEBUG */
video_via_regs* VideoRegs;
diff --git a/src/via_options.c b/src/via_options.c
index b347898..1d4c79b 100644
--- a/src/via_options.c
+++ b/src/via_options.c
@@ -63,9 +63,6 @@ typedef enum
} VIAOpts;
static OptionInfoRec VIAOptions[] = {
-#ifdef HAVE_DEBUG /* Don't document these three. */
- {OPTION_PRINTTVREGS, "PrintTVRegs", OPTV_BOOLEAN, {0}, FALSE},
-#endif
{OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_EXA_NOCOMPOSITE, "ExaNoComposite", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_EXA_SCRATCH_SIZE, "ExaScratchSize", OPTV_INTEGER, {0}, FALSE},
diff --git a/src/via_tv.c b/src/via_tv.c
index d70b810..26a34d8 100644
--- a/src/via_tv.c
+++ b/src/via_tv.c
@@ -873,11 +873,6 @@ via_tv_init(ScrnInfoPtr pScrn)
/* Save now */
pVIADisplay->TVSave(pScrn);
-#ifdef HAVE_DEBUG
- if (VIAPTR(pScrn)->PrintTVRegs)
- pVIADisplay->TVPrintRegs(pScrn);
-#endif
-
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Exiting via_tv_init.\n"));
return TRUE;
commit a0a8a194397c01482c8d2825127be547fac25ee9
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon May 10 13:21:13 2021 -0700
Discontinue undocumented PrintVGARegs option
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index 9fd87d6..1102b78 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -1690,12 +1690,6 @@ VIAScreenInit(SCREEN_INIT_ARGS_DECL)
xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
#ifdef HAVE_DEBUG
- if (pVia->PrintVGARegs) {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO,
- "Printing VGA registers.\n");
- ViaVgahwPrint(VGAHWPTR(pScrn));
- }
-
if (pVia->PrintTVRegs) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Printing TV registers.\n");
diff --git a/src/via_driver.h b/src/via_driver.h
index 73686f0..74c3c0c 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -361,7 +361,6 @@ typedef struct _VIA {
#ifdef HAVE_DEBUG
Bool disableXvBWCheck;
Bool DumpVGAROM;
- Bool PrintVGARegs;
Bool PrintTVRegs;
#endif /* HAVE_DEBUG */
diff --git a/src/via_options.c b/src/via_options.c
index 755b776..b347898 100644
--- a/src/via_options.c
+++ b/src/via_options.c
@@ -38,7 +38,6 @@
typedef enum
{
#ifdef HAVE_DEBUG
- OPTION_PRINTVGAREGS,
OPTION_PRINTTVREGS,
#endif
OPTION_NOACCEL,
@@ -65,7 +64,6 @@ typedef enum
static OptionInfoRec VIAOptions[] = {
#ifdef HAVE_DEBUG /* Don't document these three. */
- {OPTION_PRINTVGAREGS, "PrintVGARegs", OPTV_BOOLEAN, {0}, FALSE},
{OPTION_PRINTTVREGS, "PrintTVRegs", OPTV_BOOLEAN, {0}, FALSE},
#endif
{OPTION_NOACCEL, "NoAccel", OPTV_BOOLEAN, {0}, FALSE},
@@ -122,9 +120,6 @@ viaSetupDefaultOptions(ScrnInfoPtr pScrn)
pVia->maxDriSize = 0;
pVia->agpMem = AGP_SIZE / 1024;
pVia->VideoEngine = VIDEO_ENGINE_CLE;
-#ifdef HAVE_DEBUG
- pVia->PrintVGARegs = FALSE;
-#endif
/*
* Disable vertical interpolation because the size of
@@ -302,24 +297,6 @@ viaProcessUMSOptions(ScrnInfoPtr pScrn)
"Will try to allocate %d KB of AGP memory.\n",
pVia->agpMem);
-#ifdef HAVE_DEBUG
-/*
- pVia->PrintVGARegs = FALSE;
-*/
- from = xf86GetOptValBool(VIAOptions,
- OPTION_PRINTVGAREGS,
- &pVia->PrintVGARegs) ?
- X_CONFIG : X_DEFAULT;
- xf86DrvMsg(pScrn->scrnIndex, from,
- "Will %sprint VGA registers.\n",
- pVia->PrintVGARegs ? "" : "not ");
- if (pVia->PrintVGARegs)
- /*
- * Do this as early as possible.
- */
- ViaVgahwPrint(VGAHWPTR(pScrn));
-#endif /* HAVE_DEBUG */
-
pVIADisplay->TVDotCrawl = FALSE;
from = xf86GetOptValBool(VIAOptions,
OPTION_TVDOTCRAWL,
commit ea463dec5708e897ca141ab23b907401274c5521
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon May 10 13:19:56 2021 -0700
Version bumped to 0.6.401
This version fixes a crash if a required submodule (i.e., vgahw, fb,
etc.) supplied by X Server is not found.
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/configure.ac b/configure.ac
index 611da07..9a6646d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-openchrome],
- [0.6.400],
+ [0.6.401],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit e3677b849516e6d4ea94f324975a1884d4729fe2
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon May 10 13:19:56 2021 -0700
Check to see if pScrn->driverPrivate is null in VIAFreeScreen()
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_driver.c b/src/via_driver.c
index 35debb6..9fd87d6 100644
--- a/src/via_driver.c
+++ b/src/via_driver.c
@@ -401,6 +401,16 @@ VIAFreeScreen(FREE_SCREEN_ARGS_DECL)
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAFreeScreen\n"));
+ /*
+ * There is no guarantee that pVia
+ * (same as pScrn->driverPrivate) is valid.
+ * Hence, check to see if it is a null pointer.
+ * If it is null, do nothing and exit.
+ */
+ if (!pVia) {
+ goto exit;
+ }
+
if (xf86LoaderCheckSymbol("vgaHWFreeHWRec")) {
vgaHWFreeHWRec(pScrn);
}
@@ -410,6 +420,8 @@ VIAFreeScreen(FREE_SCREEN_ARGS_DECL)
}
VIAFreeRec(pScrn);
+exit:
+ return;
}
static void
commit 81d959000b744a1efd50fdfc3ccde52940201263
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon May 10 13:19:56 2021 -0700
Discontinue the no longer used ViaVgahw*() functions inside via_vgahw.c
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_vgahw.c b/src/via_vgahw.c
index 965b96f..1f7b7cf 100644
--- a/src/via_vgahw.c
+++ b/src/via_vgahw.c
@@ -34,65 +34,6 @@
#include "xf86.h"
#include "via_driver.h" /* for HAVE_DEBUG */
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-#define PIOOFFSET hwp->PIOOffset
-#else
-#define PIOOFFSET 0
-#endif
-
-CARD8
-ViaVgahwIn(vgaHWPtr hwp, int address)
-{
- if (hwp->MMIOBase)
- return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + address);
- else
- return inb(PIOOFFSET + address);
-}
-
-static void
-ViaVgahwOut(vgaHWPtr hwp, int address, CARD8 value)
-{
- if (hwp->MMIOBase)
- MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + address, value);
- else
- outb(PIOOFFSET + address, value);
-}
-
-/*
- * An indexed read.
- */
-static CARD8
-ViaVgahwRead(vgaHWPtr hwp, int indexaddress, CARD8 index, int valueaddress)
-{
- ViaVgahwOut(hwp, indexaddress, index);
- return ViaVgahwIn(hwp, valueaddress);
-}
-
-/*
- * An indexed write.
- */
-void
-ViaVgahwWrite(vgaHWPtr hwp, int indexaddress, CARD8 index,
- int valueaddress, CARD8 value)
-{
- ViaVgahwOut(hwp, indexaddress, index);
- ViaVgahwOut(hwp, valueaddress, value);
-}
-
-
-void
-ViaVgahwMask(vgaHWPtr hwp, int indexaddress, CARD8 index,
- int valueaddress, CARD8 value, CARD8 mask)
-{
- CARD8 tmp;
-
- tmp = ViaVgahwRead(hwp, indexaddress, index, valueaddress);
- tmp &= ~mask;
- tmp |= (value & mask);
-
- ViaVgahwWrite(hwp, indexaddress, index, valueaddress, tmp);
-}
-
void
ViaCrtcMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask)
{
diff --git a/src/via_vgahw.h b/src/via_vgahw.h
index e830024..38c0fc9 100644
--- a/src/via_vgahw.h
+++ b/src/via_vgahw.h
@@ -25,13 +25,6 @@
#include "vgaHW.h"
-CARD8 ViaVgahwIn(vgaHWPtr hwp, int address);
-void ViaVgahwWrite(vgaHWPtr hwp, int indexaddress, CARD8 index,
- int valueaddress, CARD8 value);
-
-void ViaVgahwMask(vgaHWPtr hwp, int indexaddress, CARD8 index,
- int valueaddress, CARD8 value, CARD8 mask);
-
void ViaCrtcMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask);
void ViaSeqMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask);
void ViaGrMask(vgaHWPtr hwp, CARD8 index, CARD8 value, CARD8 mask);
commit 683b63ffa441a69974f70bc37a09fb12cd07e499
Author: Kevin Brace <kevinbr...@gmx.com>
Date: Mon May 10 13:19:56 2021 -0700
Read Port 0x3C2 via readST00() supplied by vgaHW.h
Signed-off-by: Kevin Brace <kevinbr...@gmx.com>
diff --git a/src/via_analog.c b/src/via_analog.c
index 473b7aa..17e2f41 100644
--- a/src/via_analog.c
+++ b/src/via_analog.c
@@ -212,7 +212,7 @@ viaAnalogDetectConnector(ScrnInfoPtr pScrn)
VT3324, VT3353: SR40[7]=1 --> SR40[7] = 0 --> check 3C2[4]
other: SR40[7]=1 --> check 3C2[4] --> SR40[7]=0
*/
- if (ViaVgahwIn(hwp, 0x3C2) & BIT(4)) {
+ if (hwp->readST00(hwp) & BIT(4)) {
connectorDetected = TRUE;
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"VGA connector detected.\n"));
_______________________________________________
openchrome-devel mailing list
openchrome-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/openchrome-devel
