[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50 Fix declarat...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f7b6e5ddcbda
branches:  trunk
changeset: 1028369:f7b6e5ddcbda
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 10:49:38 2021 +0000

description:
Fix declarations and mark __unused.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c     |  11 ++++++---
 sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_head507d.c |   6 +++-
 sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_headc57d.c |  10 ++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diffs (118 lines):

diff -r 3a6e799197ee -r f7b6e5ddcbda sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c   Sun Dec 19 10:49:29 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c   Sun Dec 19 10:49:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_dispnv50_disp.c,v 1.3 2021/12/19 10:49:29 riastradh Exp $      */
+/*     $NetBSD: nouveau_dispnv50_disp.c,v 1.4 2021/12/19 10:49:38 riastradh Exp $      */
 
 /*
  * Copyright 2011 Red Hat Inc.
@@ -24,7 +24,7 @@
  * Authors: Ben Skeggs
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv50_disp.c,v 1.3 2021/12/19 10:49:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv50_disp.c,v 1.4 2021/12/19 10:49:38 riastradh Exp $");
 
 #include "disp.h"
 #include "atom.h"
@@ -58,9 +58,12 @@
 #include "nouveau_encoder.h"
 #include "nouveau_fence.h"
 #include "nouveau_fbcon.h"
+#include "nv50_display.h"
 
 #include <subdev/bios/dp.h>
 
+#include <linux/nbsd-namespace.h>
+
 /******************************************************************************
  * Atomic state
  *****************************************************************************/
@@ -1234,7 +1237,7 @@
 {
        struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev);
        struct drm_encoder *encoder;
-       int ret;
+       int ret __unused;
 
        NV_ATOMIC(drm, "%s: mstm cleanup\n", mstm->outp->base.base.name);
        ret = drm_dp_check_act_status(&mstm->mgr);
@@ -1258,7 +1261,7 @@
 {
        struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev);
        struct drm_encoder *encoder;
-       int ret;
+       int ret __unused;
 
        NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name);
        ret = drm_dp_update_payload_part1(&mstm->mgr);
diff -r 3a6e799197ee -r f7b6e5ddcbda sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_head507d.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_head507d.c       Sun Dec 19 10:49:29 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_head507d.c       Sun Dec 19 10:49:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_dispnv50_head507d.c,v 1.2 2021/12/18 23:45:32 riastradh Exp $  */
+/*     $NetBSD: nouveau_dispnv50_head507d.c,v 1.3 2021/12/19 10:49:38 riastradh Exp $  */
 
 /*
  * Copyright 2018 Red Hat Inc.
@@ -22,11 +22,13 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv50_head507d.c,v 1.2 2021/12/18 23:45:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv50_head507d.c,v 1.3 2021/12/19 10:49:38 riastradh Exp $");
 
 #include "head.h"
 #include "core.h"
 
+#include <linux/nbsd-namespace.h>
+
 void
 head507d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
diff -r 3a6e799197ee -r f7b6e5ddcbda sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_headc57d.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_headc57d.c       Sun Dec 19 10:49:29 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_headc57d.c       Sun Dec 19 10:49:38 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_dispnv50_headc57d.c,v 1.2 2021/12/18 23:45:32 riastradh Exp $  */
+/*     $NetBSD: nouveau_dispnv50_headc57d.c,v 1.3 2021/12/19 10:49:38 riastradh Exp $  */
 
 /*
  * Copyright 2018 Red Hat Inc.
@@ -22,7 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv50_headc57d.c,v 1.2 2021/12/18 23:45:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv50_headc57d.c,v 1.3 2021/12/19 10:49:38 riastradh Exp $");
 
 #include "head.h"
 #include "atom.h"
@@ -74,7 +74,7 @@
        }
 }
 
-void
+static void
 headc57d_olut_clr(struct nv50_head *head)
 {
        struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
@@ -86,7 +86,7 @@
        }
 }
 
-void
+static void
 headc57d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
        struct nv50_dmac *core = &nv50_disp(head->base.base.dev)->core->chan;
@@ -156,7 +156,7 @@
        writew(readw(mem - 4), mem + 4);
 }
 
-bool
+static bool
 headc57d_olut(struct nv50_head *head, struct nv50_head_atom *asyh, int size)
 {
        if (size != 0 && size != 256 && size != 1024)