[PATCH] Revert "drm/amd/display: Add fallback configuration when set DRR"

[Alex Deucher]

On Mon, Apr 22, 2024 at 10:02 AM Rodrigo Siqueira
<Rodrigo.Siqueira at amd.com> wrote:
>
> This reverts commit 5ea4581611d14a6a0e8df40965802ec7bee9c671.
>
> This change must be reverted since it caused soft hangs when changing
> the refresh rate to 122 & 144Hz when using a 7000 series GPU.
>
> Reported-by: Mark Broadworth <Mark.Broadworth at amd.com>
> Cc: Daniel Wheeler <daniel.wheeler at amd.com>
> Cc: Harry Wentland <harry.wentland at amd.com>
> Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira at amd.com>

Acked-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c    | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c b/drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c
> index c4f0e1951427..52eab8fccb7f 100644
> --- a/drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c
> +++ b/drivers/gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c
> @@ -293,16 +293,9 @@ static void optc32_set_drr(
>                 }
>
>                 optc->funcs->set_vtotal_min_max(optc, params->vertical_total_min - 1, params->vertical_total_max - 1);
> -               optc32_setup_manual_trigger(optc);
> -       } else {
> -               REG_UPDATE_4(OTG_V_TOTAL_CONTROL,
> -                               OTG_SET_V_TOTAL_MIN_MASK, 0,
> -                               OTG_V_TOTAL_MIN_SEL, 0,
> -                               OTG_V_TOTAL_MAX_SEL, 0,
> -                               OTG_FORCE_LOCK_ON_EVENT, 0);
> -
> -               optc->funcs->set_vtotal_min_max(optc, 0, 0);
>         }
> +
> +       optc32_setup_manual_trigger(optc);
>  }
>
>  static struct timing_generator_funcs dcn32_tg_funcs = {
> --
> 2.43.0
>