From: jsg Date: Wed, 22 Jun 2022 22:46:24 +0000 (+0000) Subject: Revert "drm/amd/display: Fix DCN3 B0 DP Alt Mapping" X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=42e4540104b5f728efa7f03481a4ceb0a3aa4feb;p=openbsd Revert "drm/amd/display: Fix DCN3 B0 DP Alt Mapping" From Stylon Wang 22fbef00c9a3d1aac705e3dc3493bad92360bb41 in linux 5.15.y/5.15.49 1039188806d4cfdf9c412bb4ddb51b4d8cd15478 in mainline linux --- diff --git a/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_resource.c index 310ced5058c..b60ab3cc0f1 100644 --- a/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_resource.c +++ b/sys/dev/pci/drm/amd/display/dc/dcn31/dcn31_resource.c @@ -1294,12 +1294,6 @@ static struct stream_encoder *dcn31_stream_encoder_create( if (!enc1 || !vpg || !afmt) 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],