lkml.org 
[lkml]   [2022]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 001/106] Revert "drm/amd/display: Fix DCN3 B0 DP Alt Mapping"
    Date
    From: Stylon Wang <stylon.wang@amd.com>

    commit 1039188806d4cfdf9c412bb4ddb51b4d8cd15478 upstream.

    This reverts commit 4b7786d87fb3adf3e534c4f1e4f824d8700b786b.

    Commit 4b7786d87fb3 ("drm/amd/display: Fix DCN3 B0 DP Alt Mapping")
    is causing 2nd USB-C display not lighting up.
    Phy id remapping is done differently than is assumed in this
    patch.

    Signed-off-by: Stylon Wang <stylon.wang@amd.com>
    Reviewed-by: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
    Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Cc: "Limonciello, Mario" <Mario.Limonciello@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 6 ------
    1 file changed, 6 deletions(-)

    --- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
    +++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
    @@ -1294,12 +1294,6 @@ static struct stream_encoder *dcn31_stre
    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],

    \
     
     \ /
      Last update: 2022-06-20 15:16    [W:5.801 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site