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 X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E8117C433EF for ; Tue, 21 Sep 2021 10:12:51 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8906760EB4 for ; Tue, 21 Sep 2021 10:12:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8906760EB4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ADC4B6E930; Tue, 21 Sep 2021 10:12:50 +0000 (UTC) Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by gabe.freedesktop.org (Postfix) with ESMTPS id 40B146E930 for ; Tue, 21 Sep 2021 10:12:49 +0000 (UTC) Received: by mail-wr1-x435.google.com with SMTP id q26so37450751wrc.7 for ; Tue, 21 Sep 2021 03:12:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ipUOFzWIov197fs5+28PM8Ix36c67adYXiR+puFnJwE=; b=wOLrBskZ10wQlvdXyuUTNcoSXUwlKkH3g6N3nLEIqDpo25BDo9mFJssl/rtimPNwQw pT74GJGWGgaxtevTvngcBQM7w+aEsB7SH5aEup6r6KqhiilxDPQTXzIwqY9Q5Hznh+TQ NA7uTnMjJPi5WRw6QOVPALjkKJun9qPbID4pYblrxxWOTMbMFUsJa3cwLyj6F1XltIu4 fuyuOh5etg/MgBmJW2qCuKF9Q4Bc0FXD/5geVIyidiWq64TwGxTolK83qbeVjGSitlUC BrVRg4XusNhynS6glu6j+eCkrMDT5UTRzq8mlQfKsGxKiExSd3l0c5Pyo7dL+wfABK+W JTAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ipUOFzWIov197fs5+28PM8Ix36c67adYXiR+puFnJwE=; b=MwdrgK5ZLQI+MN/yj9sj0VKxe26BhEIGrmA7rYH5KAOVE17dS1OoBZO75MP65Bl2Gq dzgfS7jZMidwzkhy7cQ/4tYPCDjvFnUwBAIzdhs3EXRRt9ASIosYGW9t6ECAUfiQTsw3 CgP3roTQWtMPVl0La85PGK2ey3RD20XVadvJdsfdwjRdTU6Rqs1YLN4jOO14c19B65I8 yZkfVQ2hkm82AzZMftDRcceHFAd7Bc5Aq1tbKc0hxFwdQnFNVOamNeI17/BasfBtukg6 T6x/bDjItz7j3307HtoYleMsBzXohqgMiHvW3u0pqF5YvaRnlpghGHnpcTi1xDg/BegE PKJA== X-Gm-Message-State: AOAM533AZCWYHYvGSvzIJMByhyGCruXdq+bZhEmkIHIwxa+FfzQG3TKf j3uG2ra4qZhwf1BSraUZsq5sXA== X-Google-Smtp-Source: ABdhPJySFn0YTXs6HrRHkdv52Cx+lR/FqdAIWyFhFfJylOL+v+y94mPFp0V+n5G/xT+b1WXSZhcNAA== X-Received: by 2002:a1c:3543:: with SMTP id c64mr3726784wma.78.1632219167559; Tue, 21 Sep 2021 03:12:47 -0700 (PDT) Received: from blmsp ([2a02:2454:3e6:c900::97e]) by smtp.gmail.com with ESMTPSA id b7sm2264536wrm.9.2021.09.21.03.12.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 03:12:47 -0700 (PDT) Date: Tue, 21 Sep 2021 12:12:46 +0200 From: Markus Schneider-Pargmann To: Jani Nikula Cc: Chun-Kuang Hu , Philipp Zabel , Sam Ravnborg , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2 3/6] drm/edid: Add cea_sad helpers for freq/length Message-ID: <20210921101246.g7avjpzxmjmvc4gc@blmsp> References: <20210920084424.231825-1-msp@baylibre.com> <20210920084424.231825-4-msp@baylibre.com> <87mto6tg0k.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <87mto6tg0k.fsf@intel.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Jani, On Tue, Sep 21, 2021 at 12:49:31PM +0300, Jani Nikula wrote: > On Mon, 20 Sep 2021, Markus Schneider-Pargmann wrote: > > 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 > > --- > > > > Notes: > > Changes v1 -> v2: > > - Use const struct pointers. > > - Add a check whether the format is actually uncompressed or not. > > > > drivers/gpu/drm/drm_edid.c | 74 ++++++++++++++++++++++++++++++++++++++ > > include/drm/drm_edid.h | 18 ++++++++-- > > 2 files changed, 90 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > > index 6325877c5fd6..28df422fbc03 100644 > > --- a/drivers/gpu/drm/drm_edid.c > > +++ b/drivers/gpu/drm/drm_edid.c > > @@ -4666,6 +4666,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 CEA_SAD_FREQ_32KHZ: > > + return 32000; > > + case CEA_SAD_FREQ_44KHZ: > > + return 44100; > > + case CEA_SAD_FREQ_48KHZ: > > + return 48000; > > + case CEA_SAD_FREQ_88KHZ: > > + return 88200; > > + case CEA_SAD_FREQ_96KHZ: > > + return 96000; > > + case CEA_SAD_FREQ_176KHZ: > > + return 176400; > > + case 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: > > + case HDMI_AUDIO_CODING_TYPE_PCM: > > + return true; > > + default: > > + return false; > > + } > > +} > > + > > +/** > > + * 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 CEA_SAD_UNCOMPRESSED_WORD_16BIT: > > + return 16; > > + case CEA_SAD_UNCOMPRESSED_WORD_20BIT: > > + return 20; > > + case 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 deccfd39e6db..7b7d71a7154d 100644 > > --- a/include/drm/drm_edid.h > > +++ b/include/drm/drm_edid.h > > @@ -361,12 +361,24 @@ struct edid { > > > > /* Short Audio Descriptor */ > > struct cea_sad { > > - u8 format; > > + u8 format; /* See HDMI_AUDIO_CODING_TYPE_* */ > > u8 channels; /* max number of channels - 1 */ > > - u8 freq; > > + u8 freq; /* See CEA_SAD_FREQ_* */ > > u8 byte2; /* meaning depends on format */ > > }; > > > > +#define CEA_SAD_FREQ_32KHZ BIT(0) > > +#define CEA_SAD_FREQ_44KHZ BIT(1) > > +#define CEA_SAD_FREQ_48KHZ BIT(2) > > +#define CEA_SAD_FREQ_88KHZ BIT(3) > > +#define CEA_SAD_FREQ_96KHZ BIT(4) > > +#define CEA_SAD_FREQ_176KHZ BIT(5) > > +#define CEA_SAD_FREQ_192KHZ BIT(6) > > + > > +#define CEA_SAD_UNCOMPRESSED_WORD_16BIT BIT(0) > > +#define CEA_SAD_UNCOMPRESSED_WORD_20BIT BIT(1) > > +#define CEA_SAD_UNCOMPRESSED_WORD_24BIT BIT(2) > > I suggest adding DRM_ prefixes here. Thanks, will do that. Best, Markus > > BR, > Jani. > > > + > > struct drm_encoder; > > struct drm_connector; > > struct drm_connector_state; > > @@ -374,6 +386,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); > > -- > Jani Nikula, Intel Open Source Graphics Center 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 X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6178C433EF for ; Tue, 21 Sep 2021 10:14:17 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 760C760EB4 for ; Tue, 21 Sep 2021 10:14:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 760C760EB4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VD66t4VynvLXv/MiXA/PrCjR3xcYHYkm98oKpmqte6w=; b=FZKytDzSHZlhRA 66eSzNdZb9YDj66X/TLmFpdgRtt1tWa2TAETE7bv7Oz6crlCmWBEGxV487ex/wUfRmhUgLM/ky870 zcS9jBHyBziHZ33KMV+46QZoY1OuMR1eUAAy00KeBiNHLhe3Qbupx6aYqOb5+cyE8o6wIkBr1lTsP LQoDidB1YvvDaMwRXeAYUbS4oHbAURQXnJ5heuyfq2DcwYiFu+VPtNSPWMpMC+dmfhwngBCchrrH/ j9ubcvJUzTYHE7BEeWamiMEP3wN3QjELpVnHY48ZccDRw0whXuf74t+mM5UeJGp6lU+nlh7csNJm4 7pgdXnsXpiwY8tJhNvLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mScmo-004F0q-4g; Tue, 21 Sep 2021 10:14:02 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mScle-004ELw-7j for linux-mediatek@lists.infradead.org; Tue, 21 Sep 2021 10:12:52 +0000 Received: by mail-wr1-x431.google.com with SMTP id w29so37485513wra.8 for ; Tue, 21 Sep 2021 03:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ipUOFzWIov197fs5+28PM8Ix36c67adYXiR+puFnJwE=; b=wOLrBskZ10wQlvdXyuUTNcoSXUwlKkH3g6N3nLEIqDpo25BDo9mFJssl/rtimPNwQw pT74GJGWGgaxtevTvngcBQM7w+aEsB7SH5aEup6r6KqhiilxDPQTXzIwqY9Q5Hznh+TQ NA7uTnMjJPi5WRw6QOVPALjkKJun9qPbID4pYblrxxWOTMbMFUsJa3cwLyj6F1XltIu4 fuyuOh5etg/MgBmJW2qCuKF9Q4Bc0FXD/5geVIyidiWq64TwGxTolK83qbeVjGSitlUC BrVRg4XusNhynS6glu6j+eCkrMDT5UTRzq8mlQfKsGxKiExSd3l0c5Pyo7dL+wfABK+W JTAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ipUOFzWIov197fs5+28PM8Ix36c67adYXiR+puFnJwE=; b=xfCjox4zRX60UVxnTq4bfdt8XbJberduBQx0ClpXCoOzMyD+YWfpKhK50XEdN3WtIM uHraTHKmJHxr1MlRN1evTW0zBOJiKdk6VGro+jXCZ6DztqCR3EzJbqSF10gBVKEt1Ino bK7NSMPvZfE+78EfvkJIm/xq5I8JdyuSq2NqlGCHTZx68x5I92UU6TwBhGSLYPCtagsv avnjGXBJntmI+rWmEYj6yNyzMFk8+JxqttfUr+HzEdIMBeiqJ6qgxvpx4qnTkRXseLVS O5X1EYHzl1bGv2kHTFrGnNfkCG68HcQHT0bEL9RIvqoIiYx7ZlnIkD9iDNmWj+iUIt2m zWXg== X-Gm-Message-State: AOAM530hnAT/fKUqGzGR8MUGqu8o+FZ42AglXFf7YkfpoE15FHHUrnQ+ xxTm6WlMltzZZPBmiFrZgWcuI9VNxKG7WQ== X-Google-Smtp-Source: ABdhPJySFn0YTXs6HrRHkdv52Cx+lR/FqdAIWyFhFfJylOL+v+y94mPFp0V+n5G/xT+b1WXSZhcNAA== X-Received: by 2002:a1c:3543:: with SMTP id c64mr3726784wma.78.1632219167559; Tue, 21 Sep 2021 03:12:47 -0700 (PDT) Received: from blmsp ([2a02:2454:3e6:c900::97e]) by smtp.gmail.com with ESMTPSA id b7sm2264536wrm.9.2021.09.21.03.12.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 03:12:47 -0700 (PDT) Date: Tue, 21 Sep 2021 12:12:46 +0200 From: Markus Schneider-Pargmann To: Jani Nikula Cc: Chun-Kuang Hu , Philipp Zabel , Sam Ravnborg , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2 3/6] drm/edid: Add cea_sad helpers for freq/length Message-ID: <20210921101246.g7avjpzxmjmvc4gc@blmsp> References: <20210920084424.231825-1-msp@baylibre.com> <20210920084424.231825-4-msp@baylibre.com> <87mto6tg0k.fsf@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87mto6tg0k.fsf@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210921_031250_383992_95A7FB68 X-CRM114-Status: GOOD ( 27.68 ) X-BeenThere: linux-mediatek@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-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Hi Jani, On Tue, Sep 21, 2021 at 12:49:31PM +0300, Jani Nikula wrote: > On Mon, 20 Sep 2021, Markus Schneider-Pargmann wrote: > > 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 > > --- > > > > Notes: > > Changes v1 -> v2: > > - Use const struct pointers. > > - Add a check whether the format is actually uncompressed or not. > > > > drivers/gpu/drm/drm_edid.c | 74 ++++++++++++++++++++++++++++++++++++++ > > include/drm/drm_edid.h | 18 ++++++++-- > > 2 files changed, 90 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > > index 6325877c5fd6..28df422fbc03 100644 > > --- a/drivers/gpu/drm/drm_edid.c > > +++ b/drivers/gpu/drm/drm_edid.c > > @@ -4666,6 +4666,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 CEA_SAD_FREQ_32KHZ: > > + return 32000; > > + case CEA_SAD_FREQ_44KHZ: > > + return 44100; > > + case CEA_SAD_FREQ_48KHZ: > > + return 48000; > > + case CEA_SAD_FREQ_88KHZ: > > + return 88200; > > + case CEA_SAD_FREQ_96KHZ: > > + return 96000; > > + case CEA_SAD_FREQ_176KHZ: > > + return 176400; > > + case 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: > > + case HDMI_AUDIO_CODING_TYPE_PCM: > > + return true; > > + default: > > + return false; > > + } > > +} > > + > > +/** > > + * 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 CEA_SAD_UNCOMPRESSED_WORD_16BIT: > > + return 16; > > + case CEA_SAD_UNCOMPRESSED_WORD_20BIT: > > + return 20; > > + case 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 deccfd39e6db..7b7d71a7154d 100644 > > --- a/include/drm/drm_edid.h > > +++ b/include/drm/drm_edid.h > > @@ -361,12 +361,24 @@ struct edid { > > > > /* Short Audio Descriptor */ > > struct cea_sad { > > - u8 format; > > + u8 format; /* See HDMI_AUDIO_CODING_TYPE_* */ > > u8 channels; /* max number of channels - 1 */ > > - u8 freq; > > + u8 freq; /* See CEA_SAD_FREQ_* */ > > u8 byte2; /* meaning depends on format */ > > }; > > > > +#define CEA_SAD_FREQ_32KHZ BIT(0) > > +#define CEA_SAD_FREQ_44KHZ BIT(1) > > +#define CEA_SAD_FREQ_48KHZ BIT(2) > > +#define CEA_SAD_FREQ_88KHZ BIT(3) > > +#define CEA_SAD_FREQ_96KHZ BIT(4) > > +#define CEA_SAD_FREQ_176KHZ BIT(5) > > +#define CEA_SAD_FREQ_192KHZ BIT(6) > > + > > +#define CEA_SAD_UNCOMPRESSED_WORD_16BIT BIT(0) > > +#define CEA_SAD_UNCOMPRESSED_WORD_20BIT BIT(1) > > +#define CEA_SAD_UNCOMPRESSED_WORD_24BIT BIT(2) > > I suggest adding DRM_ prefixes here. Thanks, will do that. Best, Markus > > BR, > Jani. > > > + > > struct drm_encoder; > > struct drm_connector; > > struct drm_connector_state; > > @@ -374,6 +386,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); > > -- > Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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 X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 744C8C433EF for ; Tue, 21 Sep 2021 10:16:40 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 363C860ED8 for ; Tue, 21 Sep 2021 10:16:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 363C860ED8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=7CF/alf8xm6BHJ4FXck6GrKgbR1Ezie3bmRlRtQiwek=; b=ADFLa+3Z3FaSfg MM0W7NgRWMVGkXXD02dRsWMOC8BP81cBpnKa6G2tuq/uFwIzWiBCumw+z8VhbnkInhLDakrXeRseO RIts+KCw08w9+aeFaUdDPpE6TRukIuBkeJQfTNKIWh1eA8BhuQduprDCcEE1mkdnpWZ7L2gqSJYah 1BuVQyIxGfzzrMWOY7ZMfvUrXm62p1niQxn0VUOlDZtHk4CbP1/BDuLY8f9AzXSs6ryr9bSzP9ZLk vnTzlBl+rxylr/FP6jAOroH7DNkv0ej2lk+Y++aTmNTjgaznM9CJYqgOIBUh7O9SBFVGrPJniY2Ik BLiejjoVjDuWlVWXtqog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mScmw-004F30-2s; Tue, 21 Sep 2021 10:14:11 +0000 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mScle-004EM4-CF for linux-arm-kernel@lists.infradead.org; Tue, 21 Sep 2021 10:12:52 +0000 Received: by mail-wr1-x434.google.com with SMTP id t8so37494431wrq.4 for ; Tue, 21 Sep 2021 03:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ipUOFzWIov197fs5+28PM8Ix36c67adYXiR+puFnJwE=; b=wOLrBskZ10wQlvdXyuUTNcoSXUwlKkH3g6N3nLEIqDpo25BDo9mFJssl/rtimPNwQw pT74GJGWGgaxtevTvngcBQM7w+aEsB7SH5aEup6r6KqhiilxDPQTXzIwqY9Q5Hznh+TQ NA7uTnMjJPi5WRw6QOVPALjkKJun9qPbID4pYblrxxWOTMbMFUsJa3cwLyj6F1XltIu4 fuyuOh5etg/MgBmJW2qCuKF9Q4Bc0FXD/5geVIyidiWq64TwGxTolK83qbeVjGSitlUC BrVRg4XusNhynS6glu6j+eCkrMDT5UTRzq8mlQfKsGxKiExSd3l0c5Pyo7dL+wfABK+W JTAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ipUOFzWIov197fs5+28PM8Ix36c67adYXiR+puFnJwE=; b=oRPEyiEyv07ZaPxAmJGz9fJi15knhgxs/MkIIraWKC1SJPvu56khMwosOJdR/i94r2 SIu5SdqqqkJlPU9YXfwvZBqic8b93h60+NQBmwO5vuCzIkYdD1ia+RUkjRT4N6p2jnth g4Wk7wvAp2RBNzkPwSegLu2PPFDsvus9dnZn1xBILrin4q5wP17O27i8Hp4nE1EX866K O1PEBSVlldTvkBx/BjDXYr/wHRawCpQopP3DiLA8HA90CwuLLb0RlyzfiOH+/Lp2tk7f qKy9OGW74o4padWCNSMMgzVxdlP5jmHBa20wJHtoX0R0Sjh5j8tVwwx98eGdA/Sn3AAC HWDw== X-Gm-Message-State: AOAM531IIMoYrp9Eoz29mvmD3w/IYKHJVJmFSEOZPO/AHC175tvtJIGH ZErHFojQ6UwFZYzleJmJmB8YCQ== X-Google-Smtp-Source: ABdhPJySFn0YTXs6HrRHkdv52Cx+lR/FqdAIWyFhFfJylOL+v+y94mPFp0V+n5G/xT+b1WXSZhcNAA== X-Received: by 2002:a1c:3543:: with SMTP id c64mr3726784wma.78.1632219167559; Tue, 21 Sep 2021 03:12:47 -0700 (PDT) Received: from blmsp ([2a02:2454:3e6:c900::97e]) by smtp.gmail.com with ESMTPSA id b7sm2264536wrm.9.2021.09.21.03.12.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Sep 2021 03:12:47 -0700 (PDT) Date: Tue, 21 Sep 2021 12:12:46 +0200 From: Markus Schneider-Pargmann To: Jani Nikula Cc: Chun-Kuang Hu , Philipp Zabel , Sam Ravnborg , dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v2 3/6] drm/edid: Add cea_sad helpers for freq/length Message-ID: <20210921101246.g7avjpzxmjmvc4gc@blmsp> References: <20210920084424.231825-1-msp@baylibre.com> <20210920084424.231825-4-msp@baylibre.com> <87mto6tg0k.fsf@intel.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87mto6tg0k.fsf@intel.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210921_031250_493141_2F689DC5 X-CRM114-Status: GOOD ( 29.10 ) 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 Hi Jani, On Tue, Sep 21, 2021 at 12:49:31PM +0300, Jani Nikula wrote: > On Mon, 20 Sep 2021, Markus Schneider-Pargmann wrote: > > 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 > > --- > > > > Notes: > > Changes v1 -> v2: > > - Use const struct pointers. > > - Add a check whether the format is actually uncompressed or not. > > > > drivers/gpu/drm/drm_edid.c | 74 ++++++++++++++++++++++++++++++++++++++ > > include/drm/drm_edid.h | 18 ++++++++-- > > 2 files changed, 90 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > > index 6325877c5fd6..28df422fbc03 100644 > > --- a/drivers/gpu/drm/drm_edid.c > > +++ b/drivers/gpu/drm/drm_edid.c > > @@ -4666,6 +4666,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 CEA_SAD_FREQ_32KHZ: > > + return 32000; > > + case CEA_SAD_FREQ_44KHZ: > > + return 44100; > > + case CEA_SAD_FREQ_48KHZ: > > + return 48000; > > + case CEA_SAD_FREQ_88KHZ: > > + return 88200; > > + case CEA_SAD_FREQ_96KHZ: > > + return 96000; > > + case CEA_SAD_FREQ_176KHZ: > > + return 176400; > > + case 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: > > + case HDMI_AUDIO_CODING_TYPE_PCM: > > + return true; > > + default: > > + return false; > > + } > > +} > > + > > +/** > > + * 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 CEA_SAD_UNCOMPRESSED_WORD_16BIT: > > + return 16; > > + case CEA_SAD_UNCOMPRESSED_WORD_20BIT: > > + return 20; > > + case 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 deccfd39e6db..7b7d71a7154d 100644 > > --- a/include/drm/drm_edid.h > > +++ b/include/drm/drm_edid.h > > @@ -361,12 +361,24 @@ struct edid { > > > > /* Short Audio Descriptor */ > > struct cea_sad { > > - u8 format; > > + u8 format; /* See HDMI_AUDIO_CODING_TYPE_* */ > > u8 channels; /* max number of channels - 1 */ > > - u8 freq; > > + u8 freq; /* See CEA_SAD_FREQ_* */ > > u8 byte2; /* meaning depends on format */ > > }; > > > > +#define CEA_SAD_FREQ_32KHZ BIT(0) > > +#define CEA_SAD_FREQ_44KHZ BIT(1) > > +#define CEA_SAD_FREQ_48KHZ BIT(2) > > +#define CEA_SAD_FREQ_88KHZ BIT(3) > > +#define CEA_SAD_FREQ_96KHZ BIT(4) > > +#define CEA_SAD_FREQ_176KHZ BIT(5) > > +#define CEA_SAD_FREQ_192KHZ BIT(6) > > + > > +#define CEA_SAD_UNCOMPRESSED_WORD_16BIT BIT(0) > > +#define CEA_SAD_UNCOMPRESSED_WORD_20BIT BIT(1) > > +#define CEA_SAD_UNCOMPRESSED_WORD_24BIT BIT(2) > > I suggest adding DRM_ prefixes here. Thanks, will do that. Best, Markus > > BR, > Jani. > > > + > > struct drm_encoder; > > struct drm_connector; > > struct drm_connector_state; > > @@ -374,6 +386,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); > > -- > 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