drm/amd/display: try to find matching audio inst for enc inst first

[Description]
in eDP+ HDMI/DP clone or extended configuration, audio inst changed from inst 1 to inst0.
No failure related this though, just playback device endpoint inst changed.
Also  remove one addition register read.

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

2 files changed, 8 insertions, 5 deletions

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 655e08df48a0..546fe99d34f2 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1449,11 +1449,16 @@ static struct stream_encoder *find_first_free_match_stream_enc_for_link(
 
 static struct audio *find_first_free_audio(
                 struct resource_context *res_ctx,
-                const struct resource_pool *pool)
+                const struct resource_pool *pool,
+                enum engine_id id)
 {
         int i;
         for (i = 0; i < pool->audio_count; i++) {
                 if ((res_ctx->is_audio_acquired[i] == false) && (res_ctx->is_stream_enc_acquired[i] == true)) {
+                        /*we have enough audio endpoint, find the matching inst*/
+                        if (id != i)
+                                continue;
+
                         return pool->audios[i];
                 }
         }
@@ -1702,7 +1707,7 @@ enum dc_status resource_map_pool_resources(
             dc_is_audio_capable_signal(pipe_ctx->stream->signal) &&
             stream->audio_info.mode_count) {
                 pipe_ctx->stream_res.audio = find_first_free_audio(
-                &context->res_ctx, pool);
+                &context->res_ctx, pool, pipe_ctx->stream_res.stream_enc->id);
 
                 /*
                  * Audio assigned in order first come first get.
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
index c04d67db9cea..e42b6eb1c1f0 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_stream_encoder.c
@@ -87,10 +87,8 @@ static void dce110_update_generic_info_packet(
          */
         uint32_t max_retries = 50;
 
-        REG_GET(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, &regval);
         /*we need turn on clock before programming AFMT block*/
-        if (regval != 1)
-                REG_UPDATE(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, 1);
+        REG_UPDATE(AFMT_CNTL, AFMT_AUDIO_CLOCK_EN, 1);
 
         if (REG(AFMT_VBI_PACKET_CONTROL1)) {
                 if (packet_index >= 8)