[PATCH] Audio output doesn't work on HDMI and DP ports of my MSI RX 460 2G OC.

[Carlo Caione]

From: Jan Andres <jandres at gmx.net>

The line in question seems to assume some kind of correlation between
the numbering of the audio converters and the stream encoders, which
doesn't exist on my card: Here, the active stream encoders are indexed
2 and 3 while audios have index 0 and 1, so audio never comes up.

I can't judge if it's correct in general to simply drop the second part
of the condition, but this does fix the issue for me.

Signed-off-by: Jan Andres <jandres at gmx.net>
--

Hi,
respinning this patch since it is required also on my hardware (AMD
A10-9620P + RADEON R5) to have the HDMI audio working fine when using
the DC driver (tested with 'amd-staging-drm-next' and 'amd-staging-4.12'
branches).
Also it is probably worth noticing that this patch is basically
reverting 740c793f30f ("drm/amd/display: enable static audio routing)".

Thanks,

---
 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 8e60e838b455..fbf7747424a9 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -1423,7 +1423,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.14.1