drm/amd/display: Use DCN30 watermark calc for DCN301
authorZhan Liu <zhan.liu@amd.com>
Fri, 13 Aug 2021 15:31:04 +0000 (08:31 -0700)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 18 Aug 2021 22:30:00 +0000 (18:30 -0400)
commit37717b8c9f0e8c4dd73fc522769cc14649b4f657
treea0de98266c1f8a6c4fcaf0044ed7a81bd49d1a72
parent71ae580f31f27cdacbabf0b798b27fa0bffeb9a1
drm/amd/display: Use DCN30 watermark calc for DCN301

[why]
dcn301_calculate_wm_and_dl() causes flickering when external monitor is
connected.

This issue has been fixed before by commit 0e4c0ae59d7e
("drm/amdgpu/display: drop dcn301_calculate_wm_and_dl for now"), however
part of the fix was gone after commit 2cbcb78c9ee5 ("Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next").

[how]
Use dcn30_calculate_wm_and_dlg() instead as in the original fix.

Fixes: 2cbcb78c9ee5 ("Merge tag 'amd-drm-next-5.13-2021-03-23' of https://gitlab.freedesktop.org/agd5f/linux into drm-next")

Signed-off-by: Nikola Cornij <nikola.cornij@amd.com>
Reviewed-by: Zhan Liu <zhan.liu@amd.com>
Tested-by: Zhan Liu <zhan.liu@amd.com>
Tested-by: Oliver Logush <oliver.logush@amd.com>
Signed-off-by: Zhan Liu <zhan.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/display/dc/dcn301/dcn301_resource.c