From: Bo-Chen Chen <rex-bc.chen@mediatek.com>
To: <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 <rex-bc.chen@mediatek.com>,
linux-mediatek@lists.infradead.org, wenst@chromium.org,
linux-arm-kernel@lists.infradead.org,
angelogioacchino.delregno@collabora.com
Subject: [PATCH v15 11/11] drm/mediatek: Use cached audio config when changing resolution
Date: Wed, 27 Jul 2022 12:50:35 +0800 [thread overview]
Message-ID: <20220727045035.32225-12-rex-bc.chen@mediatek.com> (raw)
In-Reply-To: <20220727045035.32225-1-rex-bc.chen@mediatek.com>
When the audio is playing, we need to use the original configuration to
set the audio instead of using new configuration. Therefore, use the
cached audio configuration during a resolution switch to avoid loss of
sound.
Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
Signed-off-by: Bo-Chen Chen <rex-bc.chen@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
---
drivers/gpu/drm/mediatek/mtk_dp.c | 54 ++++++++++---------------------
1 file changed, 17 insertions(+), 37 deletions(-)
diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c
index 4fc61e0a1963..0acf246abe9b 100644
--- a/drivers/gpu/drm/mediatek/mtk_dp.c
+++ b/drivers/gpu/drm/mediatek/mtk_dp.c
@@ -94,7 +94,7 @@ struct mtk_dp_info {
struct videomode vm;
u8 frame_rate;
u32 pix_rate_khz;
- struct mtk_dp_audio_cfg audio_caps;
+ struct mtk_dp_audio_cfg audio_cur_cfg;
};
struct dp_cal_data {
@@ -1799,9 +1799,7 @@ static bool mtk_dp_edid_parse_audio_capabilities(struct mtk_dp *mtk_dp,
struct mtk_dp_audio_cfg *cfg)
{
struct cea_sad *sads;
- int sad_count;
- int i;
- bool ret = false;
+ int ret;
if (mtk_dp_is_edp(mtk_dp))
return false;
@@ -1812,36 +1810,16 @@ static bool mtk_dp_edid_parse_audio_capabilities(struct mtk_dp *mtk_dp,
dev_err(mtk_dp->dev, "EDID not found!\n");
return false;
}
- sad_count = drm_edid_to_sad(mtk_dp->edid, &sads);
- mutex_unlock(&mtk_dp->edid_lock);
- if (sad_count <= 0) {
+ ret = drm_edid_to_sad(mtk_dp->edid, &sads);
+ mutex_unlock(&mtk_dp->edid_lock);
+ if (ret <= 0) {
drm_info(mtk_dp->drm_dev, "The SADs is NULL\n");
return false;
}
-
- for (i = 0; i < sad_count; i++) {
- int sample_rate, word_length;
-
- /* Only PCM supported at the moment */
- if (sads[i].format != HDMI_AUDIO_CODING_TYPE_PCM)
- continue;
-
- sample_rate = drm_cea_sad_get_sample_rate(&sads[i]);
- word_length =
- drm_cea_sad_get_uncompressed_word_length(&sads[i]);
- if (sample_rate <= 0 || word_length <= 0)
- continue;
-
- cfg->channels = sads[i].channels;
- cfg->word_length_bits = word_length;
- cfg->sample_rate = sample_rate;
- ret = true;
- break;
- }
kfree(sads);
- return ret;
+ return true;
}
static void mtk_dp_train_change_mode(struct mtk_dp *mtk_dp)
@@ -2024,13 +2002,13 @@ static int mtk_dp_training(struct mtk_dp *mtk_dp)
mtk_dp->audio_enable =
mtk_dp_edid_parse_audio_capabilities(mtk_dp,
- &mtk_dp->info.audio_caps);
+ &mtk_dp->info.audio_cur_cfg);
if (mtk_dp->audio_enable) {
- mtk_dp_audio_setup(mtk_dp, &mtk_dp->info.audio_caps);
+ mtk_dp_audio_setup(mtk_dp, &mtk_dp->info.audio_cur_cfg);
mtk_dp_audio_mute(mtk_dp, false);
} else {
- memset(&mtk_dp->info.audio_caps, 0,
- sizeof(mtk_dp->info.audio_caps));
+ memset(&mtk_dp->info.audio_cur_cfg, 0,
+ sizeof(mtk_dp->info.audio_cur_cfg));
}
return 0;
@@ -2404,6 +2382,9 @@ static void mtk_dp_bridge_atomic_disable(struct drm_bridge *bridge,
if (mtk_dp_plug_state(mtk_dp)) {
drm_dp_dpcd_writeb(&mtk_dp->aux, DP_SET_POWER, DP_SET_POWER_D3);
usleep_range(2000, 3000);
+ } else {
+ memset(&mtk_dp->info.audio_cur_cfg, 0,
+ sizeof(mtk_dp->info.audio_cur_cfg));
}
mtk_dp_video_mute(mtk_dp, true);
@@ -2603,18 +2584,17 @@ static int mtk_dp_audio_hw_params(struct device *dev, void *data,
struct hdmi_codec_params *params)
{
struct mtk_dp *mtk_dp = dev_get_drvdata(dev);
- struct mtk_dp_audio_cfg cfg;
if (!mtk_dp->enabled) {
dev_err(mtk_dp->dev, "%s, DP is not ready!\n", __func__);
return -ENODEV;
}
- cfg.channels = params->cea.channels;
- cfg.sample_rate = params->sample_rate;
- cfg.word_length_bits = 24;
+ mtk_dp->info.audio_cur_cfg.channels = params->cea.channels;
+ mtk_dp->info.audio_cur_cfg.sample_rate = params->sample_rate;
+ mtk_dp->info.audio_cur_cfg.word_length_bits = 24;
- mtk_dp_audio_setup(mtk_dp, &cfg);
+ mtk_dp_audio_setup(mtk_dp, &mtk_dp->info.audio_cur_cfg);
return 0;
}
--
2.18.0
prev parent reply other threads:[~2022-07-27 4:51 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-27 4:50 [PATCH v15 00/11] drm/mediatek: Add MT8195 DisplayPort driver Bo-Chen Chen
2022-07-27 4:50 ` [PATCH v15 01/11] dt-bindings: mediatek,dp: Add Display Port binding Bo-Chen Chen
2022-07-27 7:23 ` Krzysztof Kozlowski
2022-07-28 9:39 ` Rex-BC Chen
2022-07-27 4:50 ` [PATCH v15 02/11] drm/edid: Convert cea_sad helper struct to kernelDoc Bo-Chen Chen
2022-07-27 4:50 ` [PATCH v15 03/11] drm/edid: Add cea_sad helpers for freq/length Bo-Chen Chen
2022-07-27 9:34 ` AngeloGioacchino Del Regno
2022-08-02 14:11 ` Jani Nikula
2022-08-05 6:54 ` Rex-BC Chen
2022-08-05 7:54 ` Jani Nikula
2022-07-27 4:50 ` [PATCH v15 04/11] video/hdmi: Add audio_infoframe packing for DP Bo-Chen Chen
2022-07-27 9:35 ` AngeloGioacchino Del Regno
2022-07-27 4:50 ` [PATCH v15 05/11] drm/mediatek: Add MT8195 Embedded DisplayPort driver Bo-Chen Chen
2022-07-27 9:36 ` AngeloGioacchino Del Regno
2022-08-02 2:56 ` CK Hu
2022-08-02 5:09 ` CK Hu
2022-08-05 8:22 ` Rex-BC Chen
2022-08-02 7:57 ` CK Hu
2022-07-27 4:50 ` [PATCH v15 06/11] drm/mediatek: Add MT8195 External DisplayPort support Bo-Chen Chen
2022-07-27 9:38 ` AngeloGioacchino Del Regno
2022-08-02 2:37 ` CK Hu
2022-08-03 5:47 ` Rex-BC Chen
2022-07-27 4:50 ` [PATCH v15 07/11] drm/mediatek: Add retry to prevent misjudgment for sink devices Bo-Chen Chen
2022-07-27 9:40 ` AngeloGioacchino Del Regno
2022-07-28 9:40 ` Rex-BC Chen
2022-08-05 7:10 ` Rex-BC Chen
2022-07-27 4:50 ` [PATCH v15 08/11] drm/mediatek: add hpd debounce Bo-Chen Chen
2022-07-27 4:50 ` [PATCH v15 09/11] drm/mediatek: set monitor to DP_SET_POWER_D3 to avoid garbage Bo-Chen Chen
2022-07-27 4:50 ` [PATCH v15 10/11] drm/mediatek: DP audio support for MT8195 Bo-Chen Chen
2022-07-27 4:50 ` Bo-Chen Chen [this message]
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=20220727045035.32225-12-rex-bc.chen@mediatek.com \
--to=rex-bc.chen@mediatek.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=airlied@linux.ie \
--cc=angelogioacchino.delregno@collabora.com \
--cc=chunkuang.hu@kernel.org \
--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=krzysztof.kozlowski+dt@linaro.org \
--cc=liangxu.xu@mediatek.com \
--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=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=wenst@chromium.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).