Module Name: src Committed By: riastradh Date: Sat Jul 9 18:41:23 UTC 2022
Modified Files: src/sys/external/bsd/drm2/linux: linux_hdmi.c Log Message: linux/hdmi: Handle audio infoframes in hdmi_infoframe_pack. Sort cases by type number. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/linux/linux_hdmi.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/linux/linux_hdmi.c diff -u src/sys/external/bsd/drm2/linux/linux_hdmi.c:1.6 src/sys/external/bsd/drm2/linux/linux_hdmi.c:1.7 --- src/sys/external/bsd/drm2/linux/linux_hdmi.c:1.6 Sat Jul 9 18:21:23 2022 +++ src/sys/external/bsd/drm2/linux/linux_hdmi.c Sat Jul 9 18:41:23 2022 @@ -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 @@ hdmi_infoframe_pack(const union hdmi_inf { switch (frame->any.type) { + 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_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_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; }