drm/amd/display: arbitration find the matching dig-az first.

[Description]
this change is in branch already.
without this change, after resume, az_inst might swapped.

Signed-off-by: Charlene Liu <charlene.liu@amd.com>
Reviewed-by: Anthony Koo <Anthony.Koo@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/core/dc_resource.c b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index 68c613229a1095fd59b627d0c62eaeee97d46b93..c31dccdc3d2e5352ec814d50053543136f465eac 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1417,19 +1417,15 @@ static struct audio *find_first_free_audio(
                const struct resource_pool *pool)
 {
        int i;
-       if (pool->audio_count >=  pool->stream_enc_count) {
-               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, no need to do dynamic distribution*/
-                               return pool->audios[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)) {
+                       return pool->audios[i];
                }
-       } else { /*first come first serve*/
-               for (i = 0; i < pool->audio_count; i++) {
-                       if (res_ctx->is_audio_acquired[i] == false) {
-
-                               return pool->audios[i];
-                       }
+       }
+       /*not found the matching one, first come first serve*/
+       for (i = 0; i < pool->audio_count; i++) {
+               if (res_ctx->is_audio_acquired[i] == false) {
+                       return pool->audios[i];
                }
        }
        return 0;