drm/amd/display: Fix writeback on DCN 3.2+

[ Upstream commit 9ef84a307582a92ef055ef0bd3db10fd8ac75960 ]

[WHAT]
1. Set no scaling for writeback as they are hardcoded in DCN3.2+.
2. Set no fast plane update for writeback commits.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Wayne Lin <wayne.lin@amd.com>
Tested-by: Dan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@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 209a6e5c713caa557086c7c59e6f0353b537cb70..150cc3fc7b2a9f96a1215730b522f613060c1522 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -10648,10 +10648,10 @@ static void dm_set_writeback(struct amdgpu_display_manager *dm,
 
        wb_info->dwb_params.capture_rate = dwb_capture_rate_0;
 
-       wb_info->dwb_params.scaler_taps.h_taps = 4;
-       wb_info->dwb_params.scaler_taps.v_taps = 4;
-       wb_info->dwb_params.scaler_taps.h_taps_c = 2;
-       wb_info->dwb_params.scaler_taps.v_taps_c = 2;
+       wb_info->dwb_params.scaler_taps.h_taps = 1;
+       wb_info->dwb_params.scaler_taps.v_taps = 1;
+       wb_info->dwb_params.scaler_taps.h_taps_c = 1;
+       wb_info->dwb_params.scaler_taps.v_taps_c = 1;
        wb_info->dwb_params.subsample_position = DWB_INTERSTITIAL_SUBSAMPLING;
 
        wb_info->mcif_buf_params.luma_pitch = afb->base.pitches[0];
@@ -11667,6 +11667,8 @@ static bool should_reset_plane(struct drm_atomic_state *state,
        struct drm_crtc_state *old_crtc_state, *new_crtc_state;
        struct dm_crtc_state *old_dm_crtc_state, *new_dm_crtc_state;
        struct amdgpu_device *adev = drm_to_adev(plane->dev);
+       struct drm_connector_state *new_con_state;
+       struct drm_connector *connector;
        int i;
 
        /*
@@ -11677,6 +11679,15 @@ static bool should_reset_plane(struct drm_atomic_state *state,
            state->allow_modeset)
                return true;
 
+       /* Check for writeback commit */
+       for_each_new_connector_in_state(state, connector, new_con_state, i) {
+               if (connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK)
+                       continue;
+
+               if (new_con_state->writeback_job)
+                       return true;
+       }
+
        if (amdgpu_in_reset(adev) && state->allow_modeset)
                return true;