blob: 6bb0047c629d01cb95aff39aa45e808bb63713fe (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
From 7dbcfbf55ac7b17f8f44845557ccda112a451c78 Mon Sep 17 00:00:00 2001
From: Harry Wentland <harry.wentland@amd.com>
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 <harry.wentland@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
---
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
|
