[src/trunk]: src/sys/external/bsd/drm2 Ifdef out Linux audio API stuff and re...

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

details:   https://anonhg.NetBSD.org/src/rev/5fb3a0b58b61
branches:  trunk
changeset: 835217:5fb3a0b58b61
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:56:59 2018 +0000

description:
Ifdef out Linux audio API stuff and re-enable intel_audio.c.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_audio.c |  12 ++++++++++--
 sys/external/bsd/drm2/i915drm/files.i915drmkms    |   4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diffs (79 lines):

diff -r f18d451d960b -r 5fb3a0b58b61 sys/external/bsd/drm2/dist/drm/i915/intel_audio.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c Mon Aug 27 07:56:47 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_audio.c Mon Aug 27 07:56:59 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_audio.c,v 1.4 2018/08/27 07:56:36 riastradh Exp $        */
+/*     $NetBSD: intel_audio.c,v 1.5 2018/08/27 07:56:59 riastradh Exp $        */
 
 /*
  * Copyright © 2014 Intel Corporation
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_audio.c,v 1.4 2018/08/27 07:56:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_audio.c,v 1.5 2018/08/27 07:56:59 riastradh Exp $");
 
 #include <linux/kernel.h>
 #include <linux/component.h>
@@ -580,6 +580,8 @@
        }
 }
 
+#ifndef __NetBSD__             /* XXX intel audio */
+
 static void i915_audio_component_get_power(struct device *dev)
 {
        intel_display_power_get(dev_to_i915(dev), POWER_DOMAIN_AUDIO);
@@ -760,6 +762,8 @@
        .unbind = i915_audio_component_unbind,
 };
 
+#endif /* __NetBSD__ */
+
 /**
  * i915_audio_component_init - initialize and register the audio component
  * @dev_priv: i915 device instance
@@ -778,6 +782,7 @@
  */
 void i915_audio_component_init(struct drm_i915_private *dev_priv)
 {
+#ifndef __NetBSD__             /* XXX intel audio */
        int ret;
 
        ret = component_add(dev_priv->dev->dev, &i915_audio_component_bind_ops);
@@ -786,6 +791,7 @@
                /* continue with reduced functionality */
                return;
        }
+#endif
 
        dev_priv->audio_component_registered = true;
 }
@@ -802,6 +808,8 @@
        if (!dev_priv->audio_component_registered)
                return;
 
+#ifndef __NetBSD__             /* XXX intel audio */
        component_del(dev_priv->dev->dev, &i915_audio_component_bind_ops);
+#endif
        dev_priv->audio_component_registered = false;
 }
diff -r f18d451d960b -r 5fb3a0b58b61 sys/external/bsd/drm2/i915drm/files.i915drmkms
--- a/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Aug 27 07:56:47 2018 +0000
+++ b/sys/external/bsd/drm2/i915drm/files.i915drmkms    Mon Aug 27 07:56:59 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.i915drmkms,v 1.25 2018/08/27 07:56:13 riastradh Exp $
+#      $NetBSD: files.i915drmkms,v 1.26 2018/08/27 07:56:59 riastradh Exp $
 
 define intelfbbus      { }
 device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
@@ -61,7 +61,7 @@
 file   external/bsd/drm2/dist/drm/i915/intel_acpi.c    i915drmkms
 file   external/bsd/drm2/dist/drm/i915/intel_atomic.c  i915drmkms
 file   external/bsd/drm2/dist/drm/i915/intel_atomic_plane.c    i915drmkms
-#file  external/bsd/drm2/dist/drm/i915/intel_audio.c   i915drmkms      # XXX hdaudio
+file   external/bsd/drm2/dist/drm/i915/intel_audio.c   i915drmkms      # XXX hdaudio
 file   external/bsd/drm2/dist/drm/i915/intel_bios.c    i915drmkms
 file   external/bsd/drm2/dist/drm/i915/intel_crt.c     i915drmkms
 file   external/bsd/drm2/dist/drm/i915/intel_csr.c     i915drmkms