xf86-video-r128: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jan 15 18:22:54 UTC 2024
configure.ac | 7 +------
src/Makefile.am | 2 +-
src/r128.h | 2 ++
src/r128_accel.c | 2 --
src/r128_crtc.c | 21 +++++++++++++--------
src/r128_output.c | 6 ++++--
src/r128_video.c | 2 +-
7 files changed, 22 insertions(+), 20 deletions(-)
New commits:
commit abb15a335ab885b51c91ebbfd28e33db1341239c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Jan 8 15:11:00 2024 -0800
Fix 9 -Wmissing-prototypes warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/src/r128.h b/src/r128.h
index 6ab6beb..df65db1 100644
--- a/src/r128.h
+++ b/src/r128.h
@@ -508,6 +508,8 @@ static inline int R128Div(int n, int d)
return (n + (d / 2)) / d;
}
+extern int getR128EntityIndex(void);
+
extern R128EntPtr R128EntPriv(ScrnInfoPtr pScrn);
extern void R128WaitForFifoFunction(ScrnInfoPtr pScrn, int entries);
extern void R128WaitForIdle(ScrnInfoPtr pScrn);
diff --git a/src/r128_accel.c b/src/r128_accel.c
index 30d9f70..581be9c 100644
--- a/src/r128_accel.c
+++ b/src/r128_accel.c
@@ -105,8 +105,6 @@
#include "r128_rop.h"
#endif
-extern int getR128EntityIndex(void);
-
/* Flush all dirty data in the Pixel Cache to memory. */
void R128EngineFlush(ScrnInfoPtr pScrn)
{
diff --git a/src/r128_crtc.c b/src/r128_crtc.c
index 09d0860..f03a857 100644
--- a/src/r128_crtc.c
+++ b/src/r128_crtc.c
@@ -54,7 +54,8 @@
/* Define CRTC registers for requested video mode. */
-Bool R128InitCrtcRegisters(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mode)
+static Bool
+R128InitCrtcRegisters(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mode)
{
ScrnInfoPtr pScrn = crtc->scrn;
R128InfoPtr info = R128PTR(pScrn);
@@ -166,7 +167,8 @@ Bool R128InitCrtcRegisters(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mo
}
/* Define CRTC2 registers for requested video mode. */
-Bool R128InitCrtc2Registers(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mode)
+static Bool
+R128InitCrtc2Registers(xf86CrtcPtr crtc, R128SavePtr save, DisplayModePtr mode)
{
ScrnInfoPtr pScrn = crtc->scrn;
R128InfoPtr info = R128PTR(pScrn);
@@ -400,8 +402,9 @@ static void R128InitPLLRegisters(xf86CrtcPtr crtc, R128SavePtr save,
}
/* Define PLL2 registers for requested video mode. */
-void R128InitPLL2Registers(xf86CrtcPtr crtc, R128SavePtr save,
- R128PLLPtr pll, double dot_clock)
+static void
+R128InitPLL2Registers(xf86CrtcPtr crtc, R128SavePtr save,
+ R128PLLPtr pll, double dot_clock)
{
#if R128_DEBUG
ScrnInfoPtr pScrn = crtc->scrn;
@@ -637,8 +640,9 @@ void R128RestorePLL2Registers(ScrnInfoPtr pScrn, R128SavePtr restore)
}
/* Define DDA registers for requested video mode. */
-Bool R128InitDDARegisters(xf86CrtcPtr crtc, R128SavePtr save,
- R128PLLPtr pll, DisplayModePtr mode)
+static Bool
+R128InitDDARegisters(xf86CrtcPtr crtc, R128SavePtr save,
+ R128PLLPtr pll, DisplayModePtr mode)
{
ScrnInfoPtr pScrn = crtc->scrn;
R128InfoPtr info = R128PTR(pScrn);
@@ -713,8 +717,9 @@ Bool R128InitDDARegisters(xf86CrtcPtr crtc, R128SavePtr save,
}
/* Define DDA2 registers for requested video mode. */
-Bool R128InitDDA2Registers(xf86CrtcPtr crtc, R128SavePtr save,
- R128PLLPtr pll, DisplayModePtr mode)
+static Bool
+R128InitDDA2Registers(xf86CrtcPtr crtc, R128SavePtr save,
+ R128PLLPtr pll, DisplayModePtr mode)
{
ScrnInfoPtr pScrn = crtc->scrn;
R128InfoPtr info = R128PTR(pScrn);
diff --git a/src/r128_output.c b/src/r128_output.c
index 1d98fb9..fd17f30 100644
--- a/src/r128_output.c
+++ b/src/r128_output.c
@@ -50,7 +50,8 @@
static void R128ConnectorFindMonitor(ScrnInfoPtr pScrn, xf86OutputPtr output);
/* Define DAC registers for the requested video mode. */
-void R128InitDACRegisters(R128SavePtr orig, R128SavePtr save, xf86OutputPtr output)
+static void
+R128InitDACRegisters(R128SavePtr orig, R128SavePtr save, xf86OutputPtr output)
{
ScrnInfoPtr pScrn = output->scrn;
R128InfoPtr info = R128PTR(pScrn);
@@ -413,7 +414,8 @@ static Bool R128I2CInit(xf86OutputPtr output, I2CBusPtr *bus_ptr, char *name)
return TRUE;
}
-void R128GetConnectorInfoFromBIOS(ScrnInfoPtr pScrn, R128OutputType *otypes)
+static void
+R128GetConnectorInfoFromBIOS(ScrnInfoPtr pScrn, R128OutputType *otypes)
{
R128InfoPtr info = R128PTR(pScrn);
uint16_t bios_header, offset;
diff --git a/src/r128_video.c b/src/r128_video.c
index cac4301..d819e88 100644
--- a/src/r128_video.c
+++ b/src/r128_video.c
@@ -389,7 +389,7 @@ R128QueryBestSize(
*
*/
-Bool
+static Bool
R128DMA(
R128InfoPtr info,
unsigned char *src,
commit 96a44413d2d3affe3947ae0b861982d69539598c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Jan 8 15:01:43 2024 -0800
Add X.Org's standard C warning flags to AM_CFLAGS
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/configure.ac b/configure.ac
index cceccb5..be1df2d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,10 +42,6 @@ XORG_DEFAULT_OPTIONS
# Initialize libtool
LT_INIT([disable-static])
-if test "x$GCC" = "xyes"; then
- CPPFLAGS="$CPPFLAGS -Wall"
-fi
-
AH_TOP([#include "xorg-server.h"])
# Define a configure option for an alternate module directory
diff --git a/src/Makefile.am b/src/Makefile.am
index 45aafb5..2cce2a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ R128_EXA_SRCS = \
r128_exa_render.c
endif
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = $(BASE_CFLAGS) $(XORG_CFLAGS) $(DRI_CFLAGS)
r128_drv_la_LTLIBRARIES = r128_drv.la
r128_drv_la_LDFLAGS = -module -avoid-version
commit d84143baf5631873146acf93951fa3660be540e2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Mon Jan 8 14:58:05 2024 -0800
configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL
AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008,
so it's time to rely on it.
Clears autoconf warnings:
configure.ac:44: warning: The macro 'AC_PROG_LIBTOOL' is obsolete.
configure.ac:44: You should run autoupdate.
aclocal.m4:3515: AC_PROG_LIBTOOL is expanded from...
configure.ac:44: the top level
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/configure.ac b/configure.ac
index e283c8c..cceccb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,7 @@ XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
# Initialize libtool
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
+LT_INIT([disable-static])
if test "x$GCC" = "xyes"; then
CPPFLAGS="$CPPFLAGS -Wall"
More information about the xorg-commit
mailing list