[PATCH] Revert "drm/amd/display: fix USB-C flag update after enc10 feature init"

[Alex Deucher]

ping?

On Fri, Mar 29, 2024 at 6:59 PM Alex Deucher <alexander.deucher at amd.com> wrote:
>
> This reverts commit b5abd7f983e14054593dc91d6df2aa5f8cc67652.
>
> This change breaks DSC on 4k monitors at 144Hz over USB-C.
>
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/3254
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Cc: Muhammad Ahmed <ahmed.ahmed at amd.com>
> Cc: Tom Chung <chiahsuan.chung at amd.com>
> Cc: Charlene Liu <charlene.liu at amd.com>
> Cc: Hamza Mahfooz <hamza.mahfooz at amd.com>
> Cc: Harry Wentland <harry.wentland at amd.com>
> ---
>  .../gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 8 +++-----
>  .../gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c | 4 ++--
>  2 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c
> index e224a028d68ac..8a0460e863097 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dio_link_encoder.c
> @@ -248,14 +248,12 @@ void dcn32_link_encoder_construct(
>         enc10->base.hpd_source = init_data->hpd_source;
>         enc10->base.connector = init_data->connector;
>
> -       enc10->base.preferred_engine = ENGINE_ID_UNKNOWN;
> -
> -       enc10->base.features = *enc_features;
>         if (enc10->base.connector.id == CONNECTOR_ID_USBC)
>                 enc10->base.features.flags.bits.DP_IS_USB_C = 1;
>
> -       if (enc10->base.connector.id == CONNECTOR_ID_USBC)
> -               enc10->base.features.flags.bits.DP_IS_USB_C = 1;
> +       enc10->base.preferred_engine = ENGINE_ID_UNKNOWN;
> +
> +       enc10->base.features = *enc_features;
>
>         enc10->base.transmitter = init_data->transmitter;
>
> diff --git a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c
> index 6e6ae3de08e4c..6864b6d174370 100644
> --- a/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c
> +++ b/drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c
> @@ -184,6 +184,8 @@ void dcn35_link_encoder_construct(
>         enc10->base.hpd_source = init_data->hpd_source;
>         enc10->base.connector = init_data->connector;
>
> +       if (enc10->base.connector.id == CONNECTOR_ID_USBC)
> +               enc10->base.features.flags.bits.DP_IS_USB_C = 1;
>
>         enc10->base.preferred_engine = ENGINE_ID_UNKNOWN;
>
> @@ -238,8 +240,6 @@ void dcn35_link_encoder_construct(
>         }
>
>         enc10->base.features.flags.bits.HDMI_6GB_EN = 1;
> -       if (enc10->base.connector.id == CONNECTOR_ID_USBC)
> -               enc10->base.features.flags.bits.DP_IS_USB_C = 1;
>
>         if (bp_funcs->get_connector_speed_cap_info)
>                 result = bp_funcs->get_connector_speed_cap_info(enc10->base.ctx->dc_bios,
> --
> 2.44.0
>