[src/trunk]: src/sys/external/bsd/drm2/linux linux/hdmi: Handle audio infofra...

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

details:   https://anonhg.NetBSD.org/src/rev/01507140fcd8
branches:  trunk
changeset: 368406:01507140fcd8
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Jul 09 18:41:23 2022 +0000

description:
linux/hdmi: Handle audio infoframes in hdmi_infoframe_pack.

Sort cases by type number.

diffstat:

 sys/external/bsd/drm2/linux/linux_hdmi.c |  18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diffs (42 lines):

diff -r 100fcdfaa028 -r 01507140fcd8 sys/external/bsd/drm2/linux/linux_hdmi.c
--- a/sys/external/bsd/drm2/linux/linux_hdmi.c  Sat Jul 09 18:21:23 2022 +0000
+++ b/sys/external/bsd/drm2/linux/linux_hdmi.c  Sat Jul 09 18:41:23 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_hdmi.c,v 1.6 2022/07/09 18:21:23 riastradh Exp $ */
+/*     $NetBSD: linux_hdmi.c,v 1.7 2022/07/09 18:41:23 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_hdmi.c,v 1.6 2022/07/09 18:21:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_hdmi.c,v 1.7 2022/07/09 18:41:23 riastradh Exp $");
 
 #include <sys/types.h>
 
@@ -671,15 +671,17 @@
 {
 
        switch (frame->any.type) {
-       case HDMI_INFOFRAME_TYPE_AVI:
-               return hdmi_avi_infoframe_pack(&frame->avi, buf, size);
-       case HDMI_INFOFRAME_TYPE_DRM:
-               return hdmi_drm_infoframe_pack(&frame->drm, buf, size);
-       case HDMI_INFOFRAME_TYPE_SPD:
-               return hdmi_spd_infoframe_pack(&frame->spd, buf, size);
        case HDMI_INFOFRAME_TYPE_VENDOR:
                return hdmi_vendor_infoframe_pack(&frame->vendor.hdmi, buf,
                    size);
+       case HDMI_INFOFRAME_TYPE_AVI:
+               return hdmi_avi_infoframe_pack(&frame->avi, buf, size);
+       case HDMI_INFOFRAME_TYPE_SPD:
+               return hdmi_spd_infoframe_pack(&frame->spd, buf, size);
+       case HDMI_INFOFRAME_TYPE_AUDIO:
+               return hdmi_audio_infoframe_pack(&frame->audio, buf, size);
+       case HDMI_INFOFRAME_TYPE_DRM:
+               return hdmi_drm_infoframe_pack(&frame->drm, buf, size);
        default:
                return -EINVAL;
        }