[openchrome-devel] xf86-video-openchrome: 6 commits - configure.ac src/via_driver.h src/via_sii164.h src/via_ums.c src/via_ums.h src/via_vt1632.h
Kevin Brace
kevinbrace at kemper.freedesktop.org
Sat Feb 29 01:43:43 UTC 2020
configure.ac | 2 +-
src/via_driver.h | 8 --------
src/via_sii164.h | 2 +-
src/via_ums.c | 38 +++++++++++++++++++-------------------
src/via_ums.h | 2 ++
src/via_vt1632.h | 2 +-
6 files changed, 24 insertions(+), 30 deletions(-)
New commits:
commit b698576623cb2996578a4e296808926df59b5f8f
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Feb 28 17:43:25 2020 -0800
Version bumped to 0.6.216
Added a fix for GCC 10 link time error issue.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/configure.ac b/configure.ac
index 05959b8..9705406 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-openchrome],
- [0.6.215],
+ [0.6.216],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/openchrome],
[xf86-video-openchrome])
commit 384cee8312dd9fa84f3f587f4f3a0d5d187d9ab8
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Feb 28 17:43:03 2020 -0800
Move iga*_crtc_funcs extern declaration to src/via_ums.h
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index bfad2ee..c39d0aa 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -360,10 +360,6 @@ const OptionInfoRec *VIAAvailableOptions(int chipid, int busid);
void viaSetupDefaultOptions(ScrnInfoPtr pScrn);
void viaProcessOptions(ScrnInfoPtr pScrn);
-/* In via_display.c. */
-extern const xf86CrtcFuncsRec iga1_crtc_funcs;
-extern const xf86CrtcFuncsRec iga2_crtc_funcs;
-
/* In via_exa.c. */
Bool viaInitExa(ScreenPtr pScreen);
Bool viaAccelSetMode(int bpp, ViaTwodContext * tdc);
diff --git a/src/via_ums.h b/src/via_ums.h
index 4c9b4ce..570da1a 100644
--- a/src/via_ums.h
+++ b/src/via_ums.h
@@ -1591,6 +1591,8 @@ void viaIGA2SetDisplayRegister(ScrnInfoPtr pScrn, DisplayModePtr mode);
void viaIGA2Save(ScrnInfoPtr pScrn);
void viaIGA2Restore(ScrnInfoPtr pScrn);
void ViaShadowCRTCSetMode(ScrnInfoPtr pScrn, DisplayModePtr mode);
+extern const xf86CrtcFuncsRec iga1_crtc_funcs;
+extern const xf86CrtcFuncsRec iga2_crtc_funcs;
/* via_analog.c */
void viaAnalogProbe(ScrnInfoPtr pScrn);
commit edb46574d4686c59e80569ba236d537097dcdd0e
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Feb 28 17:42:54 2020 -0800
Fix for GCC 10 activating stricter check for extern variables / structs
GCC 10 now activates -fno-common option by default. This results in
link time errors. Since GCC 10 is still not officially released, this
link time behavior was reproduced on older GCC releases by adding
-fno-common option manually to the generated code compilation script.
Suggested-by: Xavier Bachelot <xavier at bachelot.org>
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index b01229d..bfad2ee 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -361,8 +361,8 @@ void viaSetupDefaultOptions(ScrnInfoPtr pScrn);
void viaProcessOptions(ScrnInfoPtr pScrn);
/* In via_display.c. */
-const xf86CrtcFuncsRec iga1_crtc_funcs;
-const xf86CrtcFuncsRec iga2_crtc_funcs;
+extern const xf86CrtcFuncsRec iga1_crtc_funcs;
+extern const xf86CrtcFuncsRec iga2_crtc_funcs;
/* In via_exa.c. */
Bool viaInitExa(ScreenPtr pScreen);
diff --git a/src/via_sii164.h b/src/via_sii164.h
index 1a402aa..250ac75 100644
--- a/src/via_sii164.h
+++ b/src/via_sii164.h
@@ -51,7 +51,7 @@ typedef struct _viaSiI164 {
} viaSiI164Rec, *viaSiI164RecPtr;
-const xf86OutputFuncsRec via_sii164_funcs;
+extern const xf86OutputFuncsRec via_sii164_funcs;
Bool viaSiI164Probe(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
void viaSiI164Init(ScrnInfoPtr pScrn);
diff --git a/src/via_vt1632.h b/src/via_vt1632.h
index 4f93f6c..61dada1 100644
--- a/src/via_vt1632.h
+++ b/src/via_vt1632.h
@@ -51,7 +51,7 @@ typedef struct _VIAVT1632 {
} viaVT1632Rec, *viaVT1632RecPtr;
-const xf86OutputFuncsRec via_vt1632_funcs;
+extern const xf86OutputFuncsRec via_vt1632_funcs;
Bool viaVT1632Probe(ScrnInfoPtr pScrn, I2CBusPtr pI2CBus);
void viaVT1632Init(ScrnInfoPtr pScrn);
commit c461e101ef898a34c03253e605594925397afb3b
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Feb 28 17:42:45 2020 -0800
Initialize memPhysBase member of ScrnInfoRec struct inside viaUMSCreate()
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 24083e6..47b5678 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -237,20 +237,6 @@ viaMapMMIO(ScrnInfoPtr pScrn)
pVia->FBFreeStart = 0;
pVia->FBFreeEnd = pVia->videoRambytes;
-#ifdef HAVE_PCIACCESS
- if (pVia->Chipset == VIA_VX900) {
- pScrn->memPhysBase = pVia->PciInfo->regions[2].base_addr;
- } else {
- pScrn->memPhysBase = pVia->PciInfo->regions[0].base_addr;
- }
-#else
- if (pVia->Chipset == VIA_VX900) {
- pScrn->memPhysBase = pVia->PciInfo->memBase[2];
- } else {
- pScrn->memPhysBase = pVia->PciInfo->memBase[0];
- }
-#endif
-
/* MMIO for MPEG engine. */
pVia->MpegMapBase = pVia->MapBase + 0xc00;
@@ -766,6 +752,20 @@ viaUMSCreate(ScrnInfoPtr pScrn)
pScrn->fbOffset = pScrn->videoRam << 10;
}
+#ifdef HAVE_PCIACCESS
+ if (pVia->Chipset == VIA_VX900) {
+ pScrn->memPhysBase = pVia->PciInfo->regions[2].base_addr;
+ } else {
+ pScrn->memPhysBase = pVia->PciInfo->regions[0].base_addr;
+ }
+#else
+ if (pVia->Chipset == VIA_VX900) {
+ pScrn->memPhysBase = pVia->PciInfo->memBase[2];
+ } else {
+ pScrn->memPhysBase = pVia->PciInfo->memBase[0];
+ }
+#endif
+
if (pVia->directRenderingType == DRI_NONE) {
if (!pVia->useEXA) {
if (!viaInitFB(pScrn)) {
commit 25e4cced512a54427c1d6735c28bf4cf3d30b8a9
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Feb 28 17:42:31 2020 -0800
Initialize fbOffset member of ScrnInfoRec struct inside viaUMSCreate()
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_ums.c b/src/via_ums.c
index 799f8c6..24083e6 100644
--- a/src/via_ums.c
+++ b/src/via_ums.c
@@ -251,11 +251,6 @@ viaMapMMIO(ScrnInfoPtr pScrn)
}
#endif
- pScrn->fbOffset = 0;
- if (pVia->IsSecondary) {
- pScrn->fbOffset = pScrn->videoRam << 10;
- }
-
/* MMIO for MPEG engine. */
pVia->MpegMapBase = pVia->MapBase + 0xc00;
@@ -766,6 +761,11 @@ viaUMSCreate(ScrnInfoPtr pScrn)
DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Entered %s.\n", __func__));
+ pScrn->fbOffset = 0;
+ if (pVia->IsSecondary) {
+ pScrn->fbOffset = pScrn->videoRam << 10;
+ }
+
if (pVia->directRenderingType == DRI_NONE) {
if (!pVia->useEXA) {
if (!viaInitFB(pScrn)) {
commit 606ad21b1cb41dfae9e8f62114a4a468bb0587f3
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Feb 28 17:42:15 2020 -0800
Remove discontinued functions from src/via_driver.h
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/src/via_driver.h b/src/via_driver.h
index 1e5c49d..b01229d 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -468,8 +468,4 @@ Bool VIADRIBufferInit(ScrnInfoPtr pScrn);
#endif /* HAVE_DRI */
-void viaShowCursor(ScrnInfoPtr pScrn);
-void viaHideCursor(ScrnInfoPtr pScrn);
-Bool viaHWCursorInit(ScreenPtr pScreen);
-
#endif /* _VIA_DRIVER_H_ */
More information about the openchrome-devel
mailing list