Module Name: src
Committed By: riastradh
Date: Sun Dec 19 10:49:29 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50:
nouveau_dispnv50_disp.c
Log Message:
Ifdef out audio component stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c
diff -u src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c:1.2 src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c:1.3
--- src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c:1.2 Sat Dec 18 23:45:32 2021
+++ src/sys/external/bsd/drm2/dist/drm/nouveau/dispnv50/nouveau_dispnv50_disp.c Sun Dec 19 10:49:29 2021
@@ -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 @@ nv50_dac_create(struct drm_connector *co
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 @@ static const struct component_ops nv50_a
.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
}
/******************************************************************************
