Nouveau - Jan 2019 - [PATCH xf86-video-nouveau 0/4] Compiler warnings series

A short series of compiler visibility warning fixes that I prepared whilst
trialing improvements to xf86-video-nouveau's use of the core xorg-server
utility macros.

Rhys Kidd (4):
  wfb: Remove declaration for undefined function nouveau_wfb_init()
  dri2: Mark local create/destroy buffer and copy region functions as
    static
  xv: Mark local NVSetupTexturedVideo function as static
  xv/nv30,nv40: Mark local NV30GetSurfaceFormat and NV40GetSurfaceFormat
    as static

 src/nouveau_dri2.c | 12 ++++++------
 src/nouveau_xv.c   |  2 +-
 src/nv30_xv_tex.c  |  2 +-
 src/nv40_xv_tex.c  |  2 +-
 src/nv_proto.h     |  1 -
 5 files changed, 9 insertions(+), 10 deletions(-)

-- 
2.19.1

Fixes: 794a277 ("nv50: use libwfb for pixmap access when driver pixmaps
enabled")
Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
---
 src/nv_proto.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/nv_proto.h b/src/nv_proto.h
index 4a57406..b69fa07 100644
--- a/src/nv_proto.h
+++ b/src/nv_proto.h
@@ -61,7 +61,6 @@ Bool NVAccelM2MF(NVPtr pNv, int w, int h, int cpp, uint32_t
srco, uint32_t dsto,
 void nouveau_wfb_setup_wrap(ReadMemoryProcPtr *, WriteMemoryProcPtr *,
 			    DrawablePtr);
 void nouveau_wfb_finish_wrap(DrawablePtr);
-void nouveau_wfb_init();
 
 /* in nv_shadow.c */
 void NVRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox);
-- 
2.19.1

Avoids warnings with gcc 8.2:

nouveau_dri2.c:38:1: warning: no previous prototype for
‘nouveau_dri2_create_buffer2’ [-Wmissing-prototypes]
 nouveau_dri2_create_buffer2(ScreenPtr pScreen, DrawablePtr pDraw, unsigned int
attachment,
 ^~~~~~~~~~~~~~~~~~~~~~~~~~~
nouveau_dri2.c:109:1: warning: no previous prototype for
‘nouveau_dri2_create_buffer’ [-Wmissing-prototypes]
 nouveau_dri2_create_buffer(DrawablePtr pDraw, unsigned int attachment,
 ^~~~~~~~~~~~~~~~~~~~~~~~~~
nouveau_dri2.c:117:1: warning: no previous prototype for
‘nouveau_dri2_destroy_buffer2’ [-Wmissing-prototypes]
 nouveau_dri2_destroy_buffer2(ScreenPtr pScreen, DrawablePtr pDraw,
DRI2BufferPtr buf)
 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
nouveau_dri2.c:131:1: warning: no previous prototype for
‘nouveau_dri2_destroy_buffer’ [-Wmissing-prototypes]
 nouveau_dri2_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buf)
 ^~~~~~~~~~~~~~~~~~~~~~~~~~~
nouveau_dri2.c:137:1: warning: no previous prototype for
‘nouveau_dri2_copy_region2’ [-Wmissing-prototypes]
 nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr
pRegion,
 ^~~~~~~~~~~~~~~~~~~~~~~~~
nouveau_dri2.c:215:1: warning: no previous prototype for
‘nouveau_dri2_copy_region’ [-Wmissing-prototypes]
 nouveau_dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
 ^~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
---
 src/nouveau_dri2.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/nouveau_dri2.c b/src/nouveau_dri2.c
index a726e86..3d53785 100644
--- a/src/nouveau_dri2.c
+++ b/src/nouveau_dri2.c
@@ -34,7 +34,7 @@ static PixmapPtr get_drawable_pixmap(DrawablePtr drawable)
 		return (*drawable->pScreen->GetWindowPixmap)((WindowPtr)drawable);
 }
 
-DRI2BufferPtr
+static DRI2BufferPtr
 nouveau_dri2_create_buffer2(ScreenPtr pScreen, DrawablePtr pDraw, unsigned int
attachment,
 			   unsigned int format)
 {
@@ -105,7 +105,7 @@ nouveau_dri2_create_buffer2(ScreenPtr pScreen, DrawablePtr
pDraw, unsigned int a
 	return &nvbuf->base;
 }
 
-DRI2BufferPtr
+static DRI2BufferPtr
 nouveau_dri2_create_buffer(DrawablePtr pDraw, unsigned int attachment,
 			   unsigned int format)
 {
@@ -113,7 +113,7 @@ nouveau_dri2_create_buffer(DrawablePtr pDraw, unsigned int
attachment,
 					   attachment, format);
 }
 
-void
+static void
 nouveau_dri2_destroy_buffer2(ScreenPtr pScreen, DrawablePtr pDraw,
DRI2BufferPtr buf)
 {
 	struct nouveau_dri2_buffer *nvbuf;
@@ -127,13 +127,13 @@ nouveau_dri2_destroy_buffer2(ScreenPtr pScreen,
DrawablePtr pDraw, DRI2BufferPtr
 	free(nvbuf);
 }
 
-void
+static void
 nouveau_dri2_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buf)
 {
 	nouveau_dri2_destroy_buffer2(pDraw->pScreen, pDraw, buf);
 }
 
-void
+static void
 nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr pDraw, RegionPtr
pRegion,
 			 DRI2BufferPtr pDstBuffer, DRI2BufferPtr pSrcBuffer)
 {
@@ -211,7 +211,7 @@ nouveau_dri2_copy_region2(ScreenPtr pScreen, DrawablePtr
pDraw, RegionPtr pRegio
 	FreeScratchGC(pGC);
 }
 
-void
+static void
 nouveau_dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
 			 DRI2BufferPtr pDstBuffer, DRI2BufferPtr pSrcBuffer)
 {
-- 
2.19.1

Avoids warning with gcc 8.2:

nouveau_xv.c:2136:1: warning: no previous prototype for ‘NVSetupTexturedVideo’
[-Wmissing-prototypes]
 NVSetupTexturedVideo (ScreenPtr pScreen, XF86VideoAdaptorPtr *textureAdaptor)
 ^~~~~~~~~~~~~~~~~~~~

Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
---
 src/nouveau_xv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nouveau_xv.c b/src/nouveau_xv.c
index ddb5a99..b2d75c5 100644
--- a/src/nouveau_xv.c
+++ b/src/nouveau_xv.c
@@ -2131,7 +2131,7 @@ NV50SetupTexturedVideo (ScreenPtr pScreen)
 	return adapt;
 }
 
-void
+static void
 NVSetupTexturedVideo (ScreenPtr pScreen, XF86VideoAdaptorPtr *textureAdaptor)
 {
 	ScrnInfoPtr          pScrn = xf86ScreenToScrn(pScreen);
-- 
2.19.1

Avoids warnings with gcc 8.2:

nv30_xv_tex.c:138:1: warning: no previous prototype for ‘NV30GetSurfaceFormat’
[-Wmissing-prototypes]
 NV30GetSurfaceFormat(PixmapPtr ppix, int *fmt_ret)
 ^~~~~~~~~~~~~~~~~~~~

nv40_xv_tex.c:138:1: warning: no previous prototype for ‘NV40GetSurfaceFormat’
[-Wmissing-prototypes]
 NV40GetSurfaceFormat(PixmapPtr ppix, int *fmt_ret)
 ^~~~~~~~~~~~~~~~~~~~

Signed-off-by: Rhys Kidd <rhyskidd at gmail.com>
---
 src/nv30_xv_tex.c | 2 +-
 src/nv40_xv_tex.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nv30_xv_tex.c b/src/nv30_xv_tex.c
index bf75cfa..87b3299 100644
--- a/src/nv30_xv_tex.c
+++ b/src/nv30_xv_tex.c
@@ -134,7 +134,7 @@ NV30VideoTexture(ScrnInfoPtr pScrn, struct nouveau_bo *src,
int offset,
 	return TRUE;
 }
 
-Bool
+static Bool
 NV30GetSurfaceFormat(PixmapPtr ppix, int *fmt_ret)
 {
 	switch (ppix->drawable.bitsPerPixel) {
diff --git a/src/nv40_xv_tex.c b/src/nv40_xv_tex.c
index 79ef1fc..01f6f8e 100644
--- a/src/nv40_xv_tex.c
+++ b/src/nv40_xv_tex.c
@@ -134,7 +134,7 @@ NV40VideoTexture(ScrnInfoPtr pScrn, struct nouveau_bo *src,
int offset,
 	return TRUE;
 }
 
-Bool
+static Bool
 NV40GetSurfaceFormat(PixmapPtr ppix, int *fmt_ret)
 {
 	switch (ppix->drawable.bitsPerPixel) {
-- 
2.19.1

Thanks, series applied.

On Sun, Jan 20, 2019 at 10:21 PM Rhys Kidd <rhyskidd at gmail.com>
wrote:
>
> A short series of compiler visibility warning fixes that I prepared whilst
> trialing improvements to xf86-video-nouveau's use of the core
xorg-server
> utility macros.
>
> Rhys Kidd (4):
>   wfb: Remove declaration for undefined function nouveau_wfb_init()
>   dri2: Mark local create/destroy buffer and copy region functions as
>     static
>   xv: Mark local NVSetupTexturedVideo function as static
>   xv/nv30,nv40: Mark local NV30GetSurfaceFormat and NV40GetSurfaceFormat
>     as static
>
>  src/nouveau_dri2.c | 12 ++++++------
>  src/nouveau_xv.c   |  2 +-
>  src/nv30_xv_tex.c  |  2 +-
>  src/nv40_xv_tex.c  |  2 +-
>  src/nv_proto.h     |  1 -
>  5 files changed, 9 insertions(+), 10 deletions(-)
>
> --
> 2.19.1
>
> _______________________________________________
> Nouveau mailing list
> Nouveau at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/nouveau