From 7dbcfbf55ac7b17f8f44845557ccda112a451c78 Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Thu, 28 Sep 2017 21:03:12 -0400 Subject: [PATCH 2399/4131] Revert "drm/amd/display: enable static audio routing" This reverts commit c60c64b94c231bfd11805d056a9d85937a58beae. This commit isn't correct in all cases since we can't guarantee that we can acquire audio and stream_enc devices for same index. Signed-off-by: Harry Wentland Acked-by: Alex Deucher --- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b7dc31b..dcfdfeb 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c @@ -1416,7 +1416,7 @@ static struct audio *find_first_free_audio( { 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)) { + if (res_ctx->is_audio_acquired[i] == false) { return pool->audios[i]; } } -- 2.7.4