[src/trunk]: src hdaudio: Obsolete HDAUDIO_ENABLE_DISPLAYPORT and HDAUDIO_ENA...

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

details:   https://anonhg.NetBSD.org/src/rev/20e4681f2fe0
branches:  trunk
changeset: 364404:20e4681f2fe0
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Mar 21 09:20:04 2022 +0000

description:
hdaudio: Obsolete HDAUDIO_ENABLE_DISPLAYPORT and HDAUDIO_ENABLE_HDMI

Enable display port and HDMI devices by default rather than making this
a compile time option.

diffstat:

 share/man/man4/hdaudio.4       |  13 ++-----------
 sys/arch/evbarm/conf/GENERIC   |   4 +---
 sys/arch/evbarm/conf/GENERIC64 |   4 +---
 sys/dev/hdaudio/files.hdaudio  |   7 ++++---
 sys/dev/hdaudio/hdafg.c        |  11 ++---------
 5 files changed, 10 insertions(+), 29 deletions(-)

diffs (134 lines):

diff -r 8a01c6d96db8 -r 20e4681f2fe0 share/man/man4/hdaudio.4
--- a/share/man/man4/hdaudio.4  Mon Mar 21 09:12:09 2022 +0000
+++ b/share/man/man4/hdaudio.4  Mon Mar 21 09:20:04 2022 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: hdaudio.4,v 1.21 2021/04/10 08:01:21 nia Exp $
+.\"    $NetBSD: hdaudio.4,v 1.22 2022/03/21 09:20:04 jmcneill Exp $
 .\"
 .\" Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd March 12, 2021
+.Dd March 21, 2022
 .Dt HDAUDIO 4
 .Os
 .Sh NAME
@@ -40,8 +40,6 @@
 .Pp
 .Cd "options HDAUDIOVERBOSE"
 .Cd "options HDAUDIO_DEBUG"
-.Cd "options HDAUDIO_ENABLE_DISPLAYPORT"
-.Cd "options HDAUDIO_ENABLE_HDMI"
 .Cd "options HDAFG_DEBUG"
 .Sh DESCRIPTION
 The
@@ -84,13 +82,6 @@
 By following the published mechanisms for common implementations of widget
 parsing, it is expected that nearly all High Definition Audio devices will
 be supported without requiring per-device quirks.
-.Pp
-The
-.Dv HDAUDIO_ENABLE_DISPLAYPORT
-and
-.Dv HDAUDIO_ENABLE_HDMI
-options enable support for DisplayPort and HDMI audio output, which is disabled
-by default.
 .Sh HARDWARE
 In addition to many on-board sound cards included in mainboards, the following
 add-on card is supported:
diff -r 8a01c6d96db8 -r 20e4681f2fe0 sys/arch/evbarm/conf/GENERIC
--- a/sys/arch/evbarm/conf/GENERIC      Mon Mar 21 09:12:09 2022 +0000
+++ b/sys/arch/evbarm/conf/GENERIC      Mon Mar 21 09:20:04 2022 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC,v 1.105 2022/01/28 16:38:56 jakllsch Exp $
+#      $NetBSD: GENERIC,v 1.106 2022/03/21 09:20:04 jmcneill Exp $
 #
 #      GENERIC ARM (aarch32) kernel
 #
@@ -442,8 +442,6 @@
 hdaudio*       at fdt?                 # Intel HDA
 hdafg*                 at hdaudiobus?
 options        HDAUDIOVERBOSE
-options        HDAUDIO_ENABLE_HDMI
-options        HDAUDIO_ENABLE_DISPLAYPORT
 sun8icodec*    at fdt?                 # Audio codec (sun8i)
 sunxicodec*    at fdt?                 # Allwinner audio codec
 sunxii2s*      at fdt?                 # I2S/PCM
diff -r 8a01c6d96db8 -r 20e4681f2fe0 sys/arch/evbarm/conf/GENERIC64
--- a/sys/arch/evbarm/conf/GENERIC64    Mon Mar 21 09:12:09 2022 +0000
+++ b/sys/arch/evbarm/conf/GENERIC64    Mon Mar 21 09:20:04 2022 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC64,v 1.194 2022/01/31 09:16:09 ryo Exp $
+#      $NetBSD: GENERIC64,v 1.195 2022/03/21 09:20:04 jmcneill Exp $
 #
 #      GENERIC ARM (aarch64) kernel
 #
@@ -426,8 +426,6 @@
 hdaudio*       at pci? dev ? function ?
 hdafg*         at hdaudiobus?
 options        HDAUDIOVERBOSE
-options        HDAUDIO_ENABLE_HDMI
-options        HDAUDIO_ENABLE_DISPLAYPORT
 ausoc*         at fdt?                 # Simple SoC audio card
 simpleamp*     at fdt?                 # Simple amplifier
 spdiftx*       at fdt?                 # SPDIF transmitter
diff -r 8a01c6d96db8 -r 20e4681f2fe0 sys/dev/hdaudio/files.hdaudio
--- a/sys/dev/hdaudio/files.hdaudio     Mon Mar 21 09:12:09 2022 +0000
+++ b/sys/dev/hdaudio/files.hdaudio     Mon Mar 21 09:20:04 2022 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: files.hdaudio,v 1.5 2019/07/25 00:30:45 jmcneill Exp $
+# $NetBSD: files.hdaudio,v 1.6 2022/03/21 09:20:04 jmcneill Exp $
 
 #
 # Intel High Definition Audio (Revision 1.0)
 #
 defflag                        HDAUDIOVERBOSE
-defflag opt_hdaudio.h  HDAUDIO_ENABLE_HDMI
-defflag opt_hdaudio.h  HDAUDIO_ENABLE_DISPLAYPORT
 defflag opt_hdaudio.h  HDAUDIO_DEBUG
 defflag opt_hdaudio.h  HDAFG_DEBUG
 defflag opt_hdaudio.h  HDAFG_HDMI_DEBUG
 
+obsolete defflag       HDAUDIO_ENABLE_HDMI
+obsolete defflag       HDAUDIO_ENABLE_DISPLAYPORT
+
 define hdaudiobus      {[nid = -1]}
 device hdaudio: hdaudiobus
 file   dev/hdaudio/hdaudio.c           hdaudio
diff -r 8a01c6d96db8 -r 20e4681f2fe0 sys/dev/hdaudio/hdafg.c
--- a/sys/dev/hdaudio/hdafg.c   Mon Mar 21 09:12:09 2022 +0000
+++ b/sys/dev/hdaudio/hdafg.c   Mon Mar 21 09:20:04 2022 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.26 2022/01/07 07:34:10 mlelstv Exp $ */
+/* $NetBSD: hdafg.c,v 1.27 2022/03/21 09:20:04 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2009 Precedence Technologies Ltd <support%precedence.co.uk@localhost>
@@ -60,7 +60,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.26 2022/01/07 07:34:10 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdafg.c,v 1.27 2022/03/21 09:20:04 jmcneill Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -3807,13 +3807,6 @@
        }
        hda_debug(sc, "assoc type mask: %x\n", astype);
 
-#ifndef HDAUDIO_ENABLE_HDMI
-       astype &= ~(1 << HDAFG_AS_HDMI);
-#endif
-#ifndef HDAUDIO_ENABLE_DISPLAYPORT
-       astype &= ~(1 << HDAFG_AS_DISPLAYPORT);
-#endif
-
        if (astype == 0)
                return;