| Message ID | 20221013175148.038906183@linuxfoundation.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp410122wrs;
Thu, 13 Oct 2022 11:05:58 -0700 (PDT)
X-Google-Smtp-Source:
AMsMyM5B2KD/xloBKKnZ8i3SthuXqOBowMvqE0hlnt75Cd2DkqLDi7ScKA0uj4oJBZTLzpFVfpD3
X-Received: by 2002:aa7:8741:0:b0:562:bacb:136a with SMTP id
g1-20020aa78741000000b00562bacb136amr931936pfo.46.1665684357740;
Thu, 13 Oct 2022 11:05:57 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1665684357; cv=none;
d=google.com; s=arc-20160816;
b=sYT5vg7HCVakx9LusBBK9w/f9J+rz8MO2lYlNZyB/vIur4L7flSsWDY+YKP7YnP6Hs
SJOg2Kfg/25sdFafb+uwG4SUxgkWcAZzgZTojHJU54Mp0f9cle8ao+VIlh6Mj8YQ2Onq
Bfk2oCO8o7ONQFxBmFcLNvvsMo6TRwJKhHUesAkLMCMUqQ8cALWZzkt8mKagINyxgfAk
HXBZpvuuRhwuUH01z25nUr7xSP1+kzyMHiFyUVFkMHY7BjOoIq4yYfb5VlkzUxfJ2gQE
9J/PzNafi2KoLzlnideKeXRxJr022cceMwwHezs5z/uXPQDf8gebSOwJe3kH8d72N5Tg
Atcg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:user-agent:references:in-reply-to:message-id:date:subject:cc:to
:from:dkim-signature;
bh=skKzz8EtlPIU+pG+rLOZqhu0Gi1pgCbRP62oxiKUs08=;
b=H/nhY6JYPmjrzc/PiTXQlQs1a6xAtx9U7AkLUtZm88oqrO45pLxDiNrw2+AVHT4kf5
J4luhzb8/PQT2vsRt/98ui36DcO15xSQwqM1uNPvIg05JJZpo3jOF4ImIFb6XNU6vrgb
dPnKIG4X/VkhEFBPCHLKiVO/NbTV6czs+NujX9wlXfPOb5pHeu18v1ByhvA3bOV0wdZ/
loZ+tPdu/lfK3BJbaC7dX+qaNvfOej53hOcjDdya9i0jOg8C0pQOzHVIyUttq3aIS5M9
/fD2DRcB6biE9x0OrQBQQiTaUKi2MCSA/ezlcLVlxspXj1UD+eobSR9OEZ9Hp+o9kdo6
s7Ew==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linuxfoundation.org header.s=korg
header.b=AQyWM2Di;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
nv3-20020a17090b1b4300b0020a81819a4csi6773421pjb.86.2022.10.13.11.05.44;
Thu, 13 Oct 2022 11:05:57 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linuxfoundation.org header.s=korg
header.b=AQyWM2Di;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229926AbiJMSFW (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others);
Thu, 13 Oct 2022 14:05:22 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59552 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S230522AbiJMSDX (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 13 Oct 2022 14:03:23 -0400
Received: from dfw.source.kernel.org (dfw.source.kernel.org
[IPv6:2604:1380:4641:c500::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2FB6152C4D;
Thu, 13 Oct 2022 11:03:09 -0700 (PDT)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by dfw.source.kernel.org (Postfix) with ESMTPS id 4CC3061704;
Thu, 13 Oct 2022 17:55:24 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A99EC433C1;
Thu, 13 Oct 2022 17:55:23 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org;
s=korg; t=1665683723;
bh=XKpu/QrPdkOr6motgqw03iuGDVvktYnertgSyUUCT/E=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=AQyWM2Diddz6ggW6J9mCsClCGS+Aex2io/txY9hAthCNmBWLu9+tm9rNcb8p5J6Au
ZxKn+FbmImpxaTANtSpzRLGw+VElSd1fxexs7trnqcZMlgq6vQ2o7/2DiZXfWiN1Nu
8UXsyxPsjv4xcpcUBNdcKXSqg72ZCxnuA4H6DU+s=
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Charlene Liu <Charlene.Liu@amd.com>,
Wayne Lin <wayne.lin@amd.com>, zhikzhai <zhikai.zhai@amd.com>,
Daniel Wheeler <daniel.wheeler@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.10 28/54] drm/amd/display: skip audio setup when audio
stream is enabled
Date: Thu, 13 Oct 2022 19:52:22 +0200
Message-Id: <20221013175148.038906183@linuxfoundation.org>
X-Mailer: git-send-email 2.38.0
In-Reply-To: <20221013175147.337501757@linuxfoundation.org>
References: <20221013175147.337501757@linuxfoundation.org>
User-Agent: quilt/0.67
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,
SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1746596641389735749?=
X-GMAIL-MSGID: =?utf-8?q?1746596641389735749?=
|
| Series |
None
|
|
Commit Message
Greg KH
Oct. 13, 2022, 5:52 p.m. UTC
From: zhikzhai <zhikai.zhai@amd.com> [ Upstream commit 65fbfb02c2734cacffec5e3f492e1b4f1dabcf98 ] [why] We have minimal pipe split transition method to avoid pipe allocation outage.However, this method will invoke audio setup which cause audio output stuck once pipe reallocate. [how] skip audio setup for pipelines which audio stream has been enabled Reviewed-by: Charlene Liu <Charlene.Liu@amd.com> Acked-by: Wayne Lin <wayne.lin@amd.com> Signed-off-by: zhikzhai <zhikai.zhai@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c index 3ac6c7b65a45..e33fe0207b9e 100644 --- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c @@ -2047,7 +2047,8 @@ static void dce110_setup_audio_dto( continue; if (pipe_ctx->stream->signal != SIGNAL_TYPE_HDMI_TYPE_A) continue; - if (pipe_ctx->stream_res.audio != NULL) { + if (pipe_ctx->stream_res.audio != NULL && + pipe_ctx->stream_res.audio->enabled == false) { struct audio_output audio_output; build_audio_output(context, pipe_ctx, &audio_output); @@ -2075,7 +2076,8 @@ static void dce110_setup_audio_dto( if (!dc_is_dp_signal(pipe_ctx->stream->signal)) continue; - if (pipe_ctx->stream_res.audio != NULL) { + if (pipe_ctx->stream_res.audio != NULL && + pipe_ctx->stream_res.audio->enabled == false) { struct audio_output audio_output; build_audio_output(context, pipe_ctx, &audio_output);