[PATCH] Revert "drm/amd/display: Fixed Intermittent blue screen on OLED panel"

[Konstantin Kharlamov]

Oh, I just found on ML archive that the revert already was sent. Disregard then
this email. It's just that nobody mentioned on the gitlab thread that revert was
sent, so I decided to go ahead. Nice to know revert is on ML already ☺

On Fri, 2021-01-08 at 13:48 +0300, Konstantin Kharlamov wrote:
> This reverts commit a861736dae644a0d7abbca0c638ae6aad28feeb8.
> 
> This commit led to a power regression where AMD cards draw lots of power
> while being idle.
> 
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1407
> Cc: <stable at vger.kernel.org> # 5.10
> Signed-off-by: Konstantin Kharlamov <Hi-Angel at yandex.ru>
> ---
>  .../amd/display/dc/dml/dcn20/display_mode_vba_20v2.c  | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c
> b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c
> index 860e72a51534..80170f9721ce 100644
> --- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c
> +++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_mode_vba_20v2.c
> @@ -2635,14 +2635,15 @@ static void
> dml20v2_DISPCLKDPPCLKDCFCLKDeepSleepPrefetchParametersWatermarksAndP
>         }
>  
>         if (mode_lib->vba.DRAMClockChangeSupportsVActive &&
> -                       mode_lib->vba.MinActiveDRAMClockChangeMargin > 60 &&
> -                       mode_lib->vba.PrefetchMode[mode_lib-
> >vba.VoltageLevel][mode_lib->vba.maxMpcComb] == 0) {
> +                       mode_lib->vba.MinActiveDRAMClockChangeMargin > 60) {
>                 mode_lib->vba.DRAMClockChangeWatermark += 25;
>  
>                 for (k = 0; k < mode_lib->vba.NumberOfActivePlanes; ++k) {
> -                       if (mode_lib->vba.DRAMClockChangeWatermark >
> -                       dml_max(mode_lib->vba.StutterEnterPlusExitWatermark,
> mode_lib->vba.UrgentWatermark))
> -                               mode_lib->vba.MinTTUVBlank[k] += 25;
> +                       if (mode_lib->vba.PrefetchMode[mode_lib-
> >vba.VoltageLevel][mode_lib->vba.maxMpcComb] == 0) {
> +                               if (mode_lib->vba.DRAMClockChangeWatermark >
> +                               dml_max(mode_lib-
> >vba.StutterEnterPlusExitWatermark, mode_lib->vba.UrgentWatermark))
> +                                       mode_lib->vba.MinTTUVBlank[k] += 25;
> +                       }
>                 }
>  
>                 mode_lib->vba.DRAMClockChangeSupport[0][0] =
> dm_dram_clock_change_vactive;