From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
To: Guillaume Ranquet <granquet@baylibre.com>,
Chun-Kuang Hu <chunkuang.hu@kernel.org>,
Philipp Zabel <p.zabel@pengutronix.de>,
David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Matthias Brugger <matthias.bgg@gmail.com>,
Chunfeng Yun <chunfeng.yun@mediatek.com>,
Kishon Vijay Abraham I <kishon@ti.com>,
Vinod Koul <vkoul@kernel.org>, Helge Deller <deller@gmx.de>,
CK Hu <ck.hu@mediatek.com>, Jitao shi <jitao.shi@mediatek.com>
Cc: Markus Schneider-Pargmann <msp@baylibre.com>,
dri-devel@lists.freedesktop.org,
linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-phy@lists.infradead.org, linux-fbdev@vger.kernel.org
Subject: Re: [PATCH v10 04/21] drm/edid: Add cea_sad helpers for freq/length
Date: Wed, 25 May 2022 14:26:57 +0200 [thread overview]
Message-ID: <62abad94-fe4a-2505-506d-6e4bc6b425ff@collabora.com> (raw)
In-Reply-To: <20220523104758.29531-5-granquet@baylibre.com>
Il 23/05/22 12:47, Guillaume Ranquet ha scritto:
> 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.
>
> Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
> Signed-off-by: Guillaume Ranquet <granquet@baylibre.com>
> ---
> drivers/gpu/drm/drm_edid.c | 74 ++++++++++++++++++++++++++++++++++++++
> include/drm/drm_edid.h | 14 ++++++++
> 2 files changed, 88 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 561f53831e29..61ef1b1c972c 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -4758,6 +4758,80 @@ int drm_edid_to_speaker_allocation(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);
> +
> +static bool drm_cea_sad_is_uncompressed(const struct cea_sad *sad)
> +{
> + switch (sad->format) {
> + case HDMI_AUDIO_CODING_TYPE_STREAM:
As far as I know, bit 0 is reserved, so HDMI_AUDIO_CODING_TYPE_STREAM should
never occur here?
> + case HDMI_AUDIO_CODING_TYPE_PCM:
> + return true;
> + default:
> + return false;
> + }
> +}
> +
Also, I think that implementing a drm_cea_sad_get_compressed_max_bitrate()
function should be pretty straightforward... the spec says that this is
8 bits, byte 3 (your byte2) contains the max bitrate divided by 8kHz,
so to extract it, you read byte2 and multiply it by 8000Hz.
/**
* drm_cea_sad_get_compressed_max_bitrate - Extract maximum bitrate
* @sad: Pointer to the cea_sad structure
*
* Extracts the cea_sad byte2 field and returns the maximum bit rate
* of a compressed audio stream.
*
* Note: This function may only be called for compressed audio.
*
* Return: Maximum bitrate of compressed audio stream in bit/s or
* negative number for error
*/
int drm_cea_sad_get_compressed_max_bitrate(const struct cea_sad *sad)
{
if (drm_cea_sad_is_uncompressed(sad)) {
DRM_ERROR("Not supported: tried to get max bitrate for uncompressed format: %u\n",
sad->format);
return -EINVAL;
}
return sad->byte2 * 8000;
}
> +/**
> + * 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 (!drm_cea_sad_is_uncompressed(sad)) {
> + DRM_WARN("Unable to get the uncompressed word length for a compressed 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 37c420423625..7a939cb95b38 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(struct edid *edid, struct cea_sad **sads);
> int drm_edid_to_speaker_allocation(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);
>
next prev parent reply other threads:[~2022-05-25 12:27 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-23 10:47 [PATCH v10 00/21] drm/mediatek: Add mt8195 DisplayPort driver Guillaume Ranquet
2022-05-23 10:47 ` [PATCH v10 01/21] dt-bindings: mediatek,dpi: Add DPINTF compatible Guillaume Ranquet
2022-05-23 12:33 ` Rob Herring
2022-05-24 3:29 ` Chunfeng Yun
2022-05-25 11:55 ` AngeloGioacchino Del Regno
2022-06-07 2:31 ` Rex-BC Chen
2022-05-25 12:49 ` Maxime Ripard
2022-06-07 2:35 ` Rex-BC Chen
2022-05-23 10:47 ` [PATCH v10 02/21] dt-bindings: mediatek,dp: Add Display Port binding Guillaume Ranquet
2022-05-24 3:35 ` Chunfeng Yun
2022-06-10 2:27 ` Rex-BC Chen
2022-05-25 15:30 ` AngeloGioacchino Del Regno
2022-06-10 2:29 ` Rex-BC Chen
2022-06-02 13:20 ` Rob Herring
2022-05-23 10:47 ` [PATCH v10 03/21] drm/edid: Convert cea_sad helper struct to kernelDoc Guillaume Ranquet
2022-05-23 10:57 ` Matthias Brugger
2022-06-07 2:44 ` Rex-BC Chen
2022-05-25 12:01 ` AngeloGioacchino Del Regno
2022-06-07 2:45 ` Rex-BC Chen
2022-05-23 10:47 ` [PATCH v10 04/21] drm/edid: Add cea_sad helpers for freq/length Guillaume Ranquet
2022-05-25 12:26 ` AngeloGioacchino Del Regno [this message]
2022-06-10 6:50 ` Rex-BC Chen
2022-05-23 10:47 ` [PATCH v10 05/21] video/hdmi: Add audio_infoframe packing for DP Guillaume Ranquet
2022-05-25 12:32 ` AngeloGioacchino Del Regno
2022-06-07 3:10 ` Rex-BC Chen
2022-05-23 10:47 ` [PATCH v10 06/21] drm/mediatek: dpi: move dpi limits to SoC config Guillaume Ranquet
2022-05-23 10:47 ` [PATCH v10 07/21] drm/mediatek: dpi: implement a CK/DE pol toggle in " Guillaume Ranquet
2022-05-30 7:44 ` CK Hu
2022-06-07 2:54 ` Rex-BC Chen
2022-05-23 10:47 ` [PATCH v10 08/21] drm/mediatek: dpi: implement a swap_input " Guillaume Ranquet
2022-05-30 7:50 ` CK Hu
2022-06-13 3:12 ` Rex-BC Chen
2022-05-23 10:47 ` [PATCH v10 09/21] drm/mediatek: dpi: move dimension mask to " Guillaume Ranquet
2022-05-30 7:55 ` CK Hu
2022-05-23 10:47 ` [PATCH v10 10/21] drm/mediatek: dpi: move hvsize_mask " Guillaume Ranquet
2022-05-30 8:21 ` CK Hu
2022-05-23 10:47 ` [PATCH v10 11/21] drm/mediatek: dpi: move swap_shift " Guillaume Ranquet
2022-05-30 8:38 ` CK Hu
2022-06-02 11:38 ` Rex-BC Chen
2022-06-02 12:19 ` Rex-BC Chen
2022-05-23 10:47 ` [PATCH v10 12/21] drm/mediatek: dpi: move the yuv422_en_bit " Guillaume Ranquet
2022-05-30 8:47 ` CK Hu
2022-05-23 10:47 ` [PATCH v10 13/21] drm/mediatek: dpi: move the csc_enable bit " Guillaume Ranquet
2022-05-23 10:47 ` [PATCH v10 14/21] drm/mediatek: dpi: Add dpintf support Guillaume Ranquet
2022-05-25 12:58 ` AngeloGioacchino Del Regno
2022-06-13 6:10 ` Rex-BC Chen
2022-06-02 5:48 ` Christophe JAILLET
2022-06-13 6:05 ` Rex-BC Chen
2022-05-23 10:47 ` [PATCH v10 15/21] drm/mediatek: dpi: Only enable dpi after the bridge is enabled Guillaume Ranquet
2022-05-23 10:47 ` [PATCH v10 16/21] drm/meditek: dpi: Add matrix_sel helper Guillaume Ranquet
2022-05-23 10:47 ` [PATCH v10 17/21] phy: phy-mtk-dp: Add driver for DP phy Guillaume Ranquet
2022-06-08 16:31 ` Vinod Koul
2022-05-23 10:47 ` [PATCH v10 18/21] drm/mediatek: Add mt8195 Embedded DisplayPort driver Guillaume Ranquet
2022-05-25 5:47 ` CK Hu
2022-05-30 9:34 ` CK Hu
2022-05-30 10:08 ` CK Hu
2022-06-07 6:21 ` CK Hu
2022-06-07 12:24 ` Rex-BC Chen
2022-06-08 2:23 ` CK Hu
2022-06-08 8:43 ` Rex-BC Chen
2022-06-08 9:15 ` CK Hu
2022-06-08 11:52 ` Rex-BC Chen
2022-06-07 6:44 ` CK Hu
2022-06-07 12:44 ` Rex-BC Chen
2022-06-08 2:44 ` CK Hu
2022-06-08 12:54 ` Rex-BC Chen
2022-06-07 7:30 ` CK Hu
2022-06-07 12:46 ` Rex-BC Chen
2022-06-07 7:47 ` CK Hu
2022-06-08 10:26 ` Rex-BC Chen
2022-06-09 2:30 ` CK Hu
2022-06-09 7:24 ` Rex-BC Chen
2022-06-07 8:01 ` CK Hu
2022-06-09 7:18 ` Rex-BC Chen
2022-06-07 8:12 ` CK Hu
2022-06-07 12:55 ` Rex-BC Chen
2022-06-07 9:04 ` CK Hu
2022-06-09 8:00 ` Rex-BC Chen
2022-06-08 8:30 ` CK Hu
2022-06-09 8:03 ` Rex-BC Chen
2022-06-08 8:45 ` CK Hu
2022-06-08 8:54 ` Rex-BC Chen
2022-06-09 9:37 ` CK Hu
2022-06-10 2:10 ` Rex-BC Chen
2022-05-23 10:47 ` [PATCH v10 19/21] drm/mediatek: Add mt8195 External DisplayPort support Guillaume Ranquet
2022-05-25 13:04 ` AngeloGioacchino Del Regno
2022-05-23 10:47 ` [PATCH v10 20/21] drm/mediatek: add hpd debounce Guillaume Ranquet
2022-05-23 10:47 ` [PATCH v10 21/21] drm/mediatek: DP audio support for mt8195 Guillaume Ranquet
2022-06-02 3:50 ` [PATCH v10 00/21] drm/mediatek: Add mt8195 DisplayPort driver Rex-BC Chen
2022-06-02 5:31 ` Rex-BC Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=62abad94-fe4a-2505-506d-6e4bc6b425ff@collabora.com \
--to=angelogioacchino.delregno@collabora.com \
--cc=airlied@linux.ie \
--cc=chunfeng.yun@mediatek.com \
--cc=chunkuang.hu@kernel.org \
--cc=ck.hu@mediatek.com \
--cc=daniel@ffwll.ch \
--cc=deller@gmx.de \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=granquet@baylibre.com \
--cc=jitao.shi@mediatek.com \
--cc=kishon@ti.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-phy@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matthias.bgg@gmail.com \
--cc=mripard@kernel.org \
--cc=msp@baylibre.com \
--cc=p.zabel@pengutronix.de \
--cc=robh+dt@kernel.org \
--cc=tzimmermann@suse.de \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).