From: Liu, Zhan Date: Fri, 10 Sep 2021 18:50:08 +0000 (-0400) Subject: drm/amd/display: DIG mapping change is causing a blocker X-Git-Tag: howlett/maple/20220722_2~1941^2~13^2~13 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=05408f24ecc47df5fbf69ae563237ec47d43a32f;p=users%2Fjedix%2Flinux-maple.git drm/amd/display: DIG mapping change is causing a blocker [Why] DIG mapping change is causing a blocker [How] Revert the change for now. We will re-implement it later. Reviewed-by: Jimmy Kizito Acked-by: Rodrigo Siqueira Signed-off-by: Zhan Liu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c index 0b60ac676423..6f0c788d1904 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c @@ -1383,12 +1383,6 @@ static struct stream_encoder *dcn31_stream_encoder_create( return NULL; } - if (ctx->asic_id.chip_family == FAMILY_YELLOW_CARP && - ctx->asic_id.hw_internal_rev == YELLOW_CARP_B0) { - if ((eng_id == ENGINE_ID_DIGC) || (eng_id == ENGINE_ID_DIGD)) - eng_id = eng_id + 3; // For B0 only. C->F, D->G. - } - dcn30_dio_stream_encoder_construct(enc1, ctx, ctx->dc_bios, eng_id, vpg, afmt, &stream_enc_regs[eng_id],