drm/amd/display: Set enabled to false at start of audio disable
[Why] In an effort to stop redundant calls to dce110_disable_audio_stream the audio->enabled flag was added to the audio resource struct. While this state probably shouldn't have been tracked on the audio struct itself it still works fine for some sequences. However, it does not work for cases where we're freeing the audio resource (such as hotplugs) or when dynamic audio is enabled. In these cases the pipe_ctx->stream_res.audio = NULL before we can set audio->enabled = false. The next time we acquire the audio resource such as on hotplug the audio will not be enabled for the stream since DC thinks it's still enabled. Audio state tracking should cover this sequence. [How] Set audio->enabled = false at the start as long as we have pipe_ctx->stream_res.audio. Signed-off-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> Reviewed-by: Zhan Liu <Zhan.Liu@amd.com> Acked-by: Leo Li <sunpeng.li@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
1bcff32679
commit
92e6475ae0
|
@ -1021,6 +1021,8 @@ void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx, int option)
|
||||||
pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control(
|
pipe_ctx->stream_res.stream_enc->funcs->audio_mute_control(
|
||||||
pipe_ctx->stream_res.stream_enc, true);
|
pipe_ctx->stream_res.stream_enc, true);
|
||||||
if (pipe_ctx->stream_res.audio) {
|
if (pipe_ctx->stream_res.audio) {
|
||||||
|
pipe_ctx->stream_res.audio->enabled = false;
|
||||||
|
|
||||||
if (dc->res_pool->pp_smu)
|
if (dc->res_pool->pp_smu)
|
||||||
pp_smu = dc->res_pool->pp_smu;
|
pp_smu = dc->res_pool->pp_smu;
|
||||||
|
|
||||||
|
@ -1051,8 +1053,6 @@ void dce110_disable_audio_stream(struct pipe_ctx *pipe_ctx, int option)
|
||||||
/* dal_audio_disable_azalia_audio_jack_presence(stream->audio,
|
/* dal_audio_disable_azalia_audio_jack_presence(stream->audio,
|
||||||
* stream->stream_engine_id);
|
* stream->stream_engine_id);
|
||||||
*/
|
*/
|
||||||
if (pipe_ctx->stream_res.audio)
|
|
||||||
pipe_ctx->stream_res.audio->enabled = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue