On Thu, Jan 7, 2021 at 4:23 PM Rodrigo Siqueira <rodrigo.sique...@amd.com> wrote: > > The patch > > commit a861736dae64 ("drm/amd/display: Fixed Intermittent blue screen on OLED > panel") > > causes power regression for many users. It seems that this change causes > the MCLK to get forced high; this creates a regression for many users > since their devices were not able to drop to a low state after this > change. For this reason, this reverts commit > a861736dae644a0d7abbca0c638ae6aad28feeb8. > > Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1407 > Cc: Aurabindo Pillai <aurabindo.pil...@amd.com> > Cc: Alex Deucher <alexander.deuc...@amd.com> > Cc: Harry Wentland <harry.wentl...@amd.com> > Cc: Naveed Ashfaq <naveed.ash...@amd.com> > Cc: Hersen Wu <hersenxs...@amd.com> > Cc: Roman Li <roman...@amd.com> > Signed-off-by: Rodrigo Siqueira <rodrigo.sique...@amd.com>
Acked-by: Alex Deucher <alexander.deuc...@amd.com> > --- > .../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; > -- > 2.25.1 > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx