lkml.org 
[lkml]   [2022]   [Oct]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 27/37] drm/amd/display: skip audio setup when audio stream is enabled
    Date
    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 62d595ded866..46d7e75e4553 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
    @@ -2108,7 +2108,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);
    @@ -2156,7 +2157,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);
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-10 09:17    [W:4.161 / U:0.832 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site