From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30C5CC00140 for ; Tue, 2 Aug 2022 14:14:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=t1CZl5Zzyt93De8lt+elJnOzJHBEo3H7UK12TLAqrSs=; b=2kOjG90tyiwZRV ozPqcFmiyDOpqxNxZQ28qS3bLvsO899UDygkwkyN3TT2W1IalobrF8mr/2EMGDwioTAWEz7eyMbU8 5oMMgoDwD2z2/DQ3vM3nXUYtFqZqH5KjpNZf/D3JgHJfmWSai0nxSHWu7+NEPl1k6yY+r80MRP0/w l5YRrpfFRtX3WXo4n4DD6A5krp2ai5LG/bcFbRljqzb5mCkP+fdT48hFSjes8OTni6Q7aor6tzABI iTiqf5K+Ri7MfLmlNeq/hOpHupkSd9gBRjdi0Z7ovXH/vGJCJl/DFBWLT8adL5Y6NKlu9J8lYuQQS I62xjpqSoSl7wllaKNLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oIsdB-00Eq2P-7Q; Tue, 02 Aug 2022 14:12:21 +0000 Received: from mga07.intel.com ([134.134.136.100]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oIscz-00Epvx-Mm; Tue, 02 Aug 2022 14:12:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659449529; x=1690985529; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=dtqbIWIshtMdWZaXawlb0KolgEJHLzd9qo0q7OSwsjo=; b=MKgk8H09Desk1KLWfYLXYA5ESzKW70TP5Ylmyl11IlUtGJmhMQ+zEJg/ g2D0raC17JXmbxu9yTxw9O0h2XUsjFwvFAXGXMLBOPZ4NS517sp5Z28eQ 2tmlZ6Y7PsXs/pPQecwo6na/eL2w5FOIe8GlawtANcVUaqbZ/MjCXRQev oA1GADUeIoAxysS5+IYhINSO4vgDBkX0Dd/zhtAzOPvJcUklIPhBt2QWO gx9PHDDu/wzAcAmD6nVGLH4GDgAK22GGjhRdJ4BKFAD8RX3q0VxvIy4MB rj0Lixx9AWIvMdO2JMpczvVh/as10Dgv/HBjfmv2jr+ntH/3f6r3jR2g3 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10427"; a="353421258" X-IronPort-AV: E=Sophos;i="5.93,211,1654585200"; d="scan'208";a="353421258" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2022 07:12:06 -0700 X-IronPort-AV: E=Sophos;i="5.93,211,1654585200"; d="scan'208";a="661637859" Received: from llaviniu-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.60.134]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2022 07:11:58 -0700 From: Jani Nikula To: Bo-Chen Chen , chunkuang.hu@kernel.org, p.zabel@pengutronix.de, daniel@ffwll.ch, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, mripard@kernel.org, tzimmermann@suse.de, matthias.bgg@gmail.com, deller@gmx.de, airlied@linux.ie Cc: devicetree@vger.kernel.org, linux-fbdev@vger.kernel.org, granquet@baylibre.com, jitao.shi@mediatek.com, liangxu.xu@mediatek.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, msp@baylibre.com, Project_Global_Chrome_Upstream_Group@mediatek.com, Bo-Chen Chen , linux-mediatek@lists.infradead.org, wenst@chromium.org, linux-arm-kernel@lists.infradead.org, angelogioacchino.delregno@collabora.com Subject: Re: [PATCH v15 03/11] drm/edid: Add cea_sad helpers for freq/length In-Reply-To: <20220727045035.32225-4-rex-bc.chen@mediatek.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220727045035.32225-1-rex-bc.chen@mediatek.com> <20220727045035.32225-4-rex-bc.chen@mediatek.com> Date: Tue, 02 Aug 2022 17:11:55 +0300 Message-ID: <87zggmenv8.fsf@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220802_071209_945766_29A4EDE6 X-CRM114-Status: GOOD ( 21.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 27 Jul 2022, Bo-Chen Chen wrote: > From: Guillaume Ranquet > > This patch adds two helper functions that extract the frequency and word > length from a struct cea_sad. > > For these helper functions new defines are added that help translate the > 'freq' and 'byte2' fields into real numbers. I think we should stop adding a plethora of functions that deal with sads like this. There should probably be *one* struct that contains all the details you and everyone need extracted. There should be *one* function that fills in all the details. The struct should be placed in connector->display_info, and the function should be called *once* from update_display_info(). Ideally, the function shouldn't even be exposed from drm_edid.c, but if you still need to deal with situations where you don't call connector update, maybe it needs to be exposed. BR, Jani. > > Signed-off-by: Markus Schneider-Pargmann > Signed-off-by: Guillaume Ranquet > Signed-off-by: Bo-Chen Chen > --- > drivers/gpu/drm/drm_edid.c | 63 ++++++++++++++++++++++++++++++++++++++ > include/drm/drm_edid.h | 14 +++++++++ > 2 files changed, 77 insertions(+) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index bc43e1b32092..2a6f92da5ff3 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -4916,6 +4916,69 @@ int drm_edid_to_speaker_allocation(const struct edid *edid, u8 **sadb) > } > EXPORT_SYMBOL(drm_edid_to_speaker_allocation); > > +/** > + * drm_cea_sad_get_sample_rate - Extract the sample rate from cea_sad > + * @sad: Pointer to the cea_sad struct > + * > + * Extracts the cea_sad frequency field and returns the sample rate in Hz. > + * > + * Return: Sample rate in Hz or a negative errno if parsing failed. > + */ > +int drm_cea_sad_get_sample_rate(const struct cea_sad *sad) > +{ > + switch (sad->freq) { > + case DRM_CEA_SAD_FREQ_32KHZ: > + return 32000; > + case DRM_CEA_SAD_FREQ_44KHZ: > + return 44100; > + case DRM_CEA_SAD_FREQ_48KHZ: > + return 48000; > + case DRM_CEA_SAD_FREQ_88KHZ: > + return 88200; > + case DRM_CEA_SAD_FREQ_96KHZ: > + return 96000; > + case DRM_CEA_SAD_FREQ_176KHZ: > + return 176400; > + case DRM_CEA_SAD_FREQ_192KHZ: > + return 192000; > + default: > + return -EINVAL; > + } > +} > +EXPORT_SYMBOL(drm_cea_sad_get_sample_rate); > + > +/** > + * drm_cea_sad_get_uncompressed_word_length - Extract word length > + * @sad: Pointer to the cea_sad struct > + * > + * Extracts the cea_sad byte2 field and returns the word length for an > + * uncompressed stream. > + * > + * Note: This function may only be called for uncompressed audio. > + * > + * Return: Word length in bits or a negative errno if parsing failed. > + */ > +int drm_cea_sad_get_uncompressed_word_length(const struct cea_sad *sad) > +{ > + if (sad->format != HDMI_AUDIO_CODING_TYPE_PCM) { > + DRM_WARN("Unable to get the uncompressed word length for format: %u\n", > + sad->format); > + return -EINVAL; > + } > + > + switch (sad->byte2) { > + case DRM_CEA_SAD_UNCOMPRESSED_WORD_16BIT: > + return 16; > + case DRM_CEA_SAD_UNCOMPRESSED_WORD_20BIT: > + return 20; > + case DRM_CEA_SAD_UNCOMPRESSED_WORD_24BIT: > + return 24; > + default: > + return -EINVAL; > + } > +} > +EXPORT_SYMBOL(drm_cea_sad_get_uncompressed_word_length); > + > /** > * drm_av_sync_delay - compute the HDMI/DP sink audio-video sync delay > * @connector: connector associated with the HDMI/DP sink > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h > index c2c43a4af681..779b710aed40 100644 > --- a/include/drm/drm_edid.h > +++ b/include/drm/drm_edid.h > @@ -373,6 +373,18 @@ struct cea_sad { > u8 byte2; > }; > > +#define DRM_CEA_SAD_FREQ_32KHZ BIT(0) > +#define DRM_CEA_SAD_FREQ_44KHZ BIT(1) > +#define DRM_CEA_SAD_FREQ_48KHZ BIT(2) > +#define DRM_CEA_SAD_FREQ_88KHZ BIT(3) > +#define DRM_CEA_SAD_FREQ_96KHZ BIT(4) > +#define DRM_CEA_SAD_FREQ_176KHZ BIT(5) > +#define DRM_CEA_SAD_FREQ_192KHZ BIT(6) > + > +#define DRM_CEA_SAD_UNCOMPRESSED_WORD_16BIT BIT(0) > +#define DRM_CEA_SAD_UNCOMPRESSED_WORD_20BIT BIT(1) > +#define DRM_CEA_SAD_UNCOMPRESSED_WORD_24BIT BIT(2) > + > struct drm_encoder; > struct drm_connector; > struct drm_connector_state; > @@ -380,6 +392,8 @@ struct drm_display_mode; > > int drm_edid_to_sad(const struct edid *edid, struct cea_sad **sads); > int drm_edid_to_speaker_allocation(const struct edid *edid, u8 **sadb); > +int drm_cea_sad_get_sample_rate(const struct cea_sad *sad); > +int drm_cea_sad_get_uncompressed_word_length(const struct cea_sad *sad); > int drm_av_sync_delay(struct drm_connector *connector, > const struct drm_display_mode *mode); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel