drm/amd/display: dpms off mute az audio endpoint only.

Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Krunoslav Kovac <Krunoslav.Kovac@amd.com>
Acked-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h
index efadd7e7f984eb1e42088a80ff5ace341d91d88b..deccbc2020e2acff27bf15eafb7400b38daff0ae 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dc.h
+++ b/drivers/gpu/drm/amd/display/dc/dc.h
@@ -212,6 +212,7 @@ struct dc_debug {
        bool disable_stereo_support;
        bool vsr_support;
        bool performance_trace;
+       bool az_endpoint_mute_only;
 };
 struct dc_state;
 struct resource_pool;

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 f982f23aa0daeb877babdad8b8724f80d2b16360..65a584523ac02cd43891069f29f853aa6b914164 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -947,7 +947,11 @@ void dce110_disable_stream(struct pipe_ctx *pipe_ctx, int option)
        pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control(
                        pipe_ctx->stream_res.stream_enc, true);
        if (pipe_ctx->stream_res.audio) {
-               pipe_ctx->stream_res.audio->funcs->az_disable(pipe_ctx->stream_res.audio);
+               if (option != KEEP_ACQUIRED_RESOURCE ||
+                               !dc->debug.az_endpoint_mute_only) {
+                       /*only disalbe az_endpoint if power down or free*/
+                       pipe_ctx->stream_res.audio->funcs->az_disable(pipe_ctx->stream_res.audio);
+               }
 
                if (dc_is_dp_signal(pipe_ctx->stream->signal))
                        pipe_ctx->stream_res.stream_enc->funcs->dp_audio_disable(

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index ed616f5e4265ce2d6d10c38291544ae14cd050ce..17dd222f82feefdcbfb5af14fdd03eea09fe74e1 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -451,6 +451,7 @@ static const struct dc_debug debug_defaults_drv = {
                .disable_stereo_support = true,
                .vsr_support = true,
                .performance_trace = false,
+               .az_endpoint_mute_only = true,
 };
 
 static const struct dc_debug debug_defaults_diags = {