diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0985-drm-amd-display-re-enable-audio-after-LT-test.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0985-drm-amd-display-re-enable-audio-after-LT-test.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0985-drm-amd-display-re-enable-audio-after-LT-test.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0985-drm-amd-display-re-enable-audio-after-LT-test.patch new file mode 100644 index 00000000..c657a606 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/0985-drm-amd-display-re-enable-audio-after-LT-test.patch @@ -0,0 +1,60 @@ +From 41f1a5f323465063ab4f2ce8161d2e3cacc78eef Mon Sep 17 00:00:00 2001 +From: Wenjing Liu <Wenjing.Liu@amd.com> +Date: Thu, 17 Aug 2017 16:24:11 -0400 +Subject: [PATCH 0985/4131] drm/amd/display: re-enable audio after LT test + +[Description] +Audio should be attached to the same pipe once it is attached. +We will not remove audio endpoint in disable stream. +We will reeanble the audio after automated link training test + +Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com> +Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> +Reviewed-by: Charlene Liu <Charlene.Liu@amd.com> +Acked-by: Harry Wentland <Harry.Wentland@amd.com> +--- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 14 ++++++++++++++ + .../gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 2 -- + 2 files changed, 14 insertions(+), 2 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +index e12f1f9..3a5abd9 100644 +--- a/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c ++++ b/drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c +@@ -310,6 +310,20 @@ void dp_retrain_link_dp_test(struct dc_link *link, + + link->dc->hwss.unblank_stream(&pipes[i], + link_setting); ++ ++ if (pipes[i].stream_res.audio) { ++ /* notify audio driver for ++ * audio modes of monitor */ ++ pipes[i].stream_res.audio->funcs->az_enable( ++ pipes[i].stream_res.audio); ++ ++ /* un-mute audio */ ++ /* TODO: audio should be per stream rather than ++ * per link */ ++ pipes[i].stream_res.stream_enc->funcs-> ++ audio_mute_control( ++ pipes[i].stream_res.stream_enc, false); ++ } + } + } + } +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 8f43d6d..6b2b491 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 +@@ -758,8 +758,6 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx) + pipe_ctx->stream_res.stream_enc->funcs->hdmi_audio_disable( + pipe_ctx->stream_res.stream_enc); + +- pipe_ctx->stream_res.audio = NULL; +- + /* TODO: notify audio driver for if audio modes list changed + * add audio mode list change flag */ + /* dal_audio_disable_azalia_audio_jack_presence(stream->audio, +-- +2.7.4 + |