[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50 Ifdef out au...

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

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

description:
Ifdef out audio component stuff.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c |  14 ++++++++-
 1 files changed, 12 insertions(+), 2 deletions(-)

diffs (61 lines):

diff -r 559d3a577360 -r 3a6e799197ee 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:21 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c   Sun Dec 19 10:49:29 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_dispnv50_disp.c,v 1.2 2021/12/18 23:45:32 riastradh Exp $      */
+/*     $NetBSD: nouveau_dispnv50_disp.c,v 1.3 2021/12/19 10:49:29 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.2 2021/12/18 23:45:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_dispnv50_disp.c,v 1.3 2021/12/19 10:49:29 riastradh Exp $");
 
 #include "disp.h"
 #include "atom.h"
@@ -496,11 +496,15 @@
 static void
 nv50_audio_component_eld_notify(struct drm_audio_component *acomp, int port)
 {
+#ifndef __NetBSD__             /* XXX nouveau audio component */
        if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
                acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
                                                 port, -1);
+#endif
 }
 
+#ifndef __NetBSD__             /* XXX nouveau audio component */
+
 static int
 nv50_audio_component_get_eld(struct device *kdev, int port, int pipe,
                             bool *enabled, unsigned char *buf, int max_bytes)
@@ -574,20 +578,26 @@
        .unbind = nv50_audio_component_unbind,
 };
 
+#endif
+
 static void
 nv50_audio_component_init(struct nouveau_drm *drm)
 {
+#ifndef __NetBSD__             /* XXX nouveau audio component */
        if (!component_add(drm->dev->dev, &nv50_audio_component_bind_ops))
                drm->audio.component_registered = true;
+#endif
 }
 
 static void
 nv50_audio_component_fini(struct nouveau_drm *drm)
 {
+#ifndef __NetBSD__             /* XXX nouveau audio component */
        if (drm->audio.component_registered) {
                component_del(drm->dev->dev, &nv50_audio_component_bind_ops);
                drm->audio.component_registered = false;
        }
+#endif
 }
 
 /******************************************************************************