From nobody Sat Sep 21 23:14:28 2024 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 AFB3BC19F2C for ; Wed, 27 Jul 2022 04:51:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240439AbiG0EvN (ORCPT ); Wed, 27 Jul 2022 00:51:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240385AbiG0Eur (ORCPT ); Wed, 27 Jul 2022 00:50:47 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 396751D0D7; Tue, 26 Jul 2022 21:50:46 -0700 (PDT) X-UUID: 4bf23cf758e042288819bcf233e19ffc-20220727 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.8,REQID:37de7734-0374-4b23-be51-3dd5bc149906,OB:0,LO B:0,IP:0,URL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACT ION:release,TS:-5 X-CID-META: VersionHash:0f94e32,CLOUDID:a3dc7bc9-5f65-4fda-abe9-f2436fed4c72,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: 4bf23cf758e042288819bcf233e19ffc-20220727 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 2075174456; Wed, 27 Jul 2022 12:50:41 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Wed, 27 Jul 2022 12:50:39 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Wed, 27 Jul 2022 12:50:39 +0800 From: Bo-Chen Chen To: , , , , , , , , , CC: , , , , , , , , , , , , , , Bo-Chen Chen Subject: [PATCH v15 11/11] drm/mediatek: Use cached audio config when changing resolution Date: Wed, 27 Jul 2022 12:50:35 +0800 Message-ID: <20220727045035.32225-12-rex-bc.chen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220727045035.32225-1-rex-bc.chen@mediatek.com> References: <20220727045035.32225-1-rex-bc.chen@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Bo-Chen Chen Reviewed-by: AngeloGioacchino Del Regno --- 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/m= tk_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; }; =20 struct dp_cal_data { @@ -1799,9 +1799,7 @@ static bool mtk_dp_edid_parse_audio_capabilities(stru= ct mtk_dp *mtk_dp, struct mtk_dp_audio_cfg *cfg) { struct cea_sad *sads; - int sad_count; - int i; - bool ret =3D false; + int ret; =20 if (mtk_dp_is_edp(mtk_dp)) return false; @@ -1812,36 +1810,16 @@ static bool mtk_dp_edid_parse_audio_capabilities(st= ruct mtk_dp *mtk_dp, dev_err(mtk_dp->dev, "EDID not found!\n"); return false; } - sad_count =3D drm_edid_to_sad(mtk_dp->edid, &sads); - mutex_unlock(&mtk_dp->edid_lock); =20 - if (sad_count <=3D 0) { + ret =3D drm_edid_to_sad(mtk_dp->edid, &sads); + mutex_unlock(&mtk_dp->edid_lock); + if (ret <=3D 0) { drm_info(mtk_dp->drm_dev, "The SADs is NULL\n"); return false; } - - for (i =3D 0; i < sad_count; i++) { - int sample_rate, word_length; - - /* Only PCM supported at the moment */ - if (sads[i].format !=3D HDMI_AUDIO_CODING_TYPE_PCM) - continue; - - sample_rate =3D drm_cea_sad_get_sample_rate(&sads[i]); - word_length =3D - drm_cea_sad_get_uncompressed_word_length(&sads[i]); - if (sample_rate <=3D 0 || word_length <=3D 0) - continue; - - cfg->channels =3D sads[i].channels; - cfg->word_length_bits =3D word_length; - cfg->sample_rate =3D sample_rate; - ret =3D true; - break; - } kfree(sads); =20 - return ret; + return true; } =20 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) =20 mtk_dp->audio_enable =3D 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)); } =20 return 0; @@ -2404,6 +2382,9 @@ static void mtk_dp_bridge_atomic_disable(struct drm_b= ridge *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)); } =20 mtk_dp_video_mute(mtk_dp, true); @@ -2603,18 +2584,17 @@ static int mtk_dp_audio_hw_params(struct device *de= v, void *data, struct hdmi_codec_params *params) { struct mtk_dp *mtk_dp =3D dev_get_drvdata(dev); - struct mtk_dp_audio_cfg cfg; =20 if (!mtk_dp->enabled) { dev_err(mtk_dp->dev, "%s, DP is not ready!\n", __func__); return -ENODEV; } =20 - cfg.channels =3D params->cea.channels; - cfg.sample_rate =3D params->sample_rate; - cfg.word_length_bits =3D 24; + mtk_dp->info.audio_cur_cfg.channels =3D params->cea.channels; + mtk_dp->info.audio_cur_cfg.sample_rate =3D params->sample_rate; + mtk_dp->info.audio_cur_cfg.word_length_bits =3D 24; =20 - mtk_dp_audio_setup(mtk_dp, &cfg); + mtk_dp_audio_setup(mtk_dp, &mtk_dp->info.audio_cur_cfg); =20 return 0; } --=20 2.18.0