Commit 9ef84a30 authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher
Browse files

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



[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: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarWayne Lin <wayne.lin@amd.com>
Tested-by: default avatarDan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2ac80621

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+15 −4
Original line number Diff line number Diff line
@@ -10662,10 +10662,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];
@@ -11681,6 +11681,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;



	/*
@@ -11691,6 +11693,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;