drm/amd/display: Increase vblank offdelay for PSR panels

[Why]

Depending on when the HW latching event (vupdate) of double-buffered
registers happen relative to the PSR SDP (signals panel psr enter/exit)
deadline, and how bad the Panel clock has drifted since the last ALPM
off event, there can be up to 3 frames of delay between sending the PSR
exit cmd to DMUB fw, and when the panel starts displaying live frames.
This can manifest as micro-stuttering when userspace commit patterns
cause rapid toggling of the DRM vblank counter, since PSR enter/exit is
hooked up to DRM vblank disable/enable respectively.

In the ideal world, the panel should present the live frame immediately
on PSR exit cmd. But due to HW design and PSR limitations, immediate
exit can only happen by chance, when:

1. PSR exit cmd is ack'd by FW before HW latching (vupdate) event, and
2. Panel's SDP deadline -- determined by it's PSR Start Delay in DPCD
  71h -- is after the vupdate event. The PSR exit SDP can then be sent
  immediately after HW latches. Otherwise, we have to wait 1 frame. And
3. There is negligible drift between the panel's clock and source clock.
  Otherwise, there can be up to 1 frame of drift.

Note that this delay is not expected with Panel Replay.

[How]

Since PSR power savings can be quite substantial, and there are a lot of
systems in the wild with PSR panels, It'll be nice to have a middle
ground that balances user experience with power savings.

A simple way to achieve this is by extending the vblank offdelay, such
that additional PSR exit delays will be less perceivable.

We can set:

   20/100 * offdelay_ms = 3_frames_ms
=> offdelay_ms = 5 * 3_frames_ms

This ensures that `3_frames_ms` will only be experienced as a 20% delay
on top how long the panel has been static, and thus make the delay
less perceivable.

If this ends up being too high of a percentage, it can be dropped
further in a future change.

Fixes: 537ef0f88897 ("drm/amd/display: use new vblank enable policy for DCN35+")
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index bae83a129b5f2741c87fc0b0259069f759edd81d..c75fcf726a441a45e022dc8b2cdfaf8835547788 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -8707,14 +8707,39 @@ static void manage_dm_interrupts(struct amdgpu_device *adev,
        int offdelay;
 
        if (acrtc_state) {
-               if (amdgpu_ip_version(adev, DCE_HWIP, 0) <
-                   IP_VERSION(3, 5, 0) ||
-                   acrtc_state->stream->link->psr_settings.psr_version <
-                   DC_PSR_VERSION_UNSUPPORTED ||
-                   !(adev->flags & AMD_IS_APU)) {
-                       timing = &acrtc_state->stream->timing;
-
-                       /* at least 2 frames */
+               timing = &acrtc_state->stream->timing;
+
+               /*
+                * Depending on when the HW latching event of double-buffered
+                * registers happen relative to the PSR SDP deadline, and how
+                * bad the Panel clock has drifted since the last ALPM off
+                * event, there can be up to 3 frames of delay between sending
+                * the PSR exit cmd to DMUB fw, and when the panel starts
+                * displaying live frames.
+                *
+                * We can set:
+                *
+                * 20/100 * offdelay_ms = 3_frames_ms
+                * => offdelay_ms = 5 * 3_frames_ms
+                *
+                * This ensures that `3_frames_ms` will only be experienced as a
+                * 20% delay on top how long the display has been static, and
+                * thus make the delay less perceivable.
+                */
+               if (acrtc_state->stream->link->psr_settings.psr_version <
+                   DC_PSR_VERSION_UNSUPPORTED) {
+                       offdelay = DIV64_U64_ROUND_UP((u64)5 * 3 * 10 *
+                                                     timing->v_total *
+                                                     timing->h_total,
+                                                     timing->pix_clk_100hz);
+                       config.offdelay_ms = offdelay ?: 30;
+               } else if (amdgpu_ip_version(adev, DCE_HWIP, 0) <
+                          IP_VERSION(3, 5, 0) ||
+                          !(adev->flags & AMD_IS_APU)) {
+                       /*
+                        * Older HW and DGPU have issues with instant off;
+                        * use a 2 frame offdelay.
+                        */
                        offdelay = DIV64_U64_ROUND_UP((u64)20 *
                                                      timing->v_total *
                                                      timing->h_total,