drm/amd/display: Fix DP no audio issue

[ Upstream commit 3886b198bd6e49c801fe9552fcfbfc387a49fbbc ]

[why]
need to enable APG_CLOCK_ENABLE enable first
also need to wake up az from D3 before access az block

Reviewed-by: Swapnil Patel <swapnil.patel@amd.com>
Signed-off-by: Charlene Liu <Charlene.Liu@amd.com>
Signed-off-by: Chenyu Chen <chen-yu.chen@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit bf5e396957acafd46003318965500914d5f4edfa)
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
index 13e7c253ad6978dcccee5e1888f975cd5609bef1..31c7dfff27cbb66f8a82b3f4b96a5716733b4922 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
+++ b/drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c
@@ -1096,13 +1096,13 @@ void dce110_enable_audio_stream(struct pipe_ctx *pipe_ctx)
                        if (dc->current_state->res_ctx.pipe_ctx[i].stream_res.audio != NULL)
                                num_audio++;
                }
+               if (num_audio >= 1 && clk_mgr->funcs->enable_pme_wa) {
+                       /*wake AZ from D3 first before access az endpoint*/
+                       clk_mgr->funcs->enable_pme_wa(clk_mgr);
+               }
 
                pipe_ctx->stream_res.audio->funcs->az_enable(pipe_ctx->stream_res.audio);
 
-               if (num_audio >= 1 && clk_mgr->funcs->enable_pme_wa)
-                       /*this is the first audio. apply the PME w/a in order to wake AZ from D3*/
-                       clk_mgr->funcs->enable_pme_wa(clk_mgr);
-
                link_hwss->enable_audio_packet(pipe_ctx);
 
                if (pipe_ctx->stream_res.audio)