[PATCH 27/36] drm/amd/display: Properly map audio to engine on NV14

Rodrigo Siqueira Rodrigo.Siqueira at amd.com
Sun Apr 5 20:41:06 UTC 2020


From: Charlene Liu <Charlene.Liu at amd.com>

[why]
This reverts commit c30259abddf924533e9452f71ee03819fd6e949d.

Signed-off-by: Martin Leung <martin.leung at amd.com>
Reviewed-by: Martin Leung <Martin.Leung at amd.com>
Acked-by: Rodrigo Siqueira <Rodrigo.Siqueira at amd.com>
---
 drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
index ede0723e667d..9e1d2b2e58f9 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1324,13 +1324,6 @@ static void read_dce_straps(
 static struct audio *dcn20_create_audio(
 		struct dc_context *ctx, unsigned int inst)
 {
-	/* Navi 14 has no DIGD */
-	if (ASICREV_IS_NAVI14_M(ctx->asic_id.hw_internal_rev)) {
-		if (inst >= ENGINE_ID_DIGD) {
-			inst++;
-		}
-	}
-
 	return dce_audio_create(ctx, inst,
 			&audio_regs[inst], &audio_shift, &audio_mask);
 }
-- 
2.26.0



More information about the amd-gfx mailing list