diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3261-drm-amd-display-dpms-off-mute-az-audio-endpoint-only.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3261-drm-amd-display-dpms-off-mute-az-audio-endpoint-only.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3261-drm-amd-display-dpms-off-mute-az-audio-endpoint-only.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3261-drm-amd-display-dpms-off-mute-az-audio-endpoint-only.patch new file mode 100644 index 00000000..7ea86a03 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.14.71/3261-drm-amd-display-dpms-off-mute-az-audio-endpoint-only.patch @@ -0,0 +1,59 @@ +From aa2eaeace3f87a143542cdc61449802e34a4a049 Mon Sep 17 00:00:00 2001 +From: Charlene Liu <charlene.liu@amd.com> +Date: Tue, 9 Jan 2018 18:37:04 -0500 +Subject: [PATCH 3261/4131] 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> +--- + drivers/gpu/drm/amd/display/dc/dc.h | 1 + + drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c | 6 +++++- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 1 + + 3 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dc.h b/drivers/gpu/drm/amd/display/dc/dc.h +index 38c2508..019d042 100644 +--- 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 f982f23..65a5845 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 +@@ -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 ed616f5e..17dd222 100644 +--- 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 = { +-- +2.7.4 + |