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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 36F4FC25B07 for ; Fri, 5 Aug 2022 07:54:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240326AbiHEHyu (ORCPT ); Fri, 5 Aug 2022 03:54:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235835AbiHEHys (ORCPT ); Fri, 5 Aug 2022 03:54:48 -0400 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C5B110FFE; Fri, 5 Aug 2022 00:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1659686088; x=1691222088; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=D8hWW0KfUk2whtu9PV8gqGxUs6bf9AOiJj3yV0bOczI=; b=S11vXVZaw6wg6av+e5KdqR2/F6PvKZzlls7KeymKlWyNMvR9eJEgn8rz 4Old1i3EBXeW6DzRaCtedt5WlR9gaoR+YclCHLB5YNC0YTQoMnSPufBQn zzKuH7OZO+CGFaYt0IqMmULsoyh9jEuRmWNl70LAWfu9hkGj5kd1SWhz/ i2DW/KnEmbiflbFaOerRcmcRJ6aD4bx6WZbJB4SB8CleJbfi4MGnXNUVO FLADyTbZLMKYfspi0oPaQ6l3xdMq8E3hOqqVk/O6P+66tsSA8J9Wx4UaQ WuWmE6oQNJ/2jAYNA4rdZFYnyXxFEBDGDA4wZFYd/QwvMwtKdrD/qxzF0 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10429"; a="269918818" X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="269918818" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 00:54:38 -0700 X-IronPort-AV: E=Sophos;i="5.93,216,1654585200"; d="scan'208";a="662893834" Received: from jevargas-mobl3.amr.corp.intel.com (HELO localhost) ([10.252.32.116]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Aug 2022 00:54:30 -0700 From: Jani Nikula To: Rex-BC 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, 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: 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> <87zggmenv8.fsf@intel.com> Date: Fri, 05 Aug 2022 10:54:26 +0300 Message-ID: <87mtcjnn0t.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 05 Aug 2022, Rex-BC Chen wrote: > On Tue, 2022-08-02 at 17:11 +0300, Jani Nikula wrote: >> 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. >> >> > > Hello Jani, > > Thanks for your review. > After checking our patches, we found we will not use these two function > because we remove them in patch [11/11] drm/mediatek: Use cached audio > config when changing resolution. > > I will drop [02/11] and [03/11]. > > Thanks! Thank you too! :) BR, Jani. > > BRs, > Bo-Chen > >> > >> > 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