[PATCH AUTOSEL 6.9 11/22] drm/amd/display: Reset freesync config before update new state

[Hamza Mahfooz]

Hi Sasha,

On 7/16/24 10:24, Sasha Levin wrote:
> From: Tom Chung <chiahsuan.chung at amd.com>
> 
> [ Upstream commit 6b8487cdf9fc7bae707519ac5b5daeca18d1e85b ]
> 
> [Why]
> Sometimes the new_crtc_state->vrr_infopacket did not sync up with the
> current state.
> It will affect the update_freesync_state_on_stream() does not update
> the state correctly.
> 
> [How]
> Reset the freesync config before get_freesync_config_for_crtc() to
> make sure we have the correct new_crtc_state for VRR.

Please drop this patch from the stable queue entirely, since it has
already been reverted (as of commit dc1000bf463d ("Revert
"drm/amd/display: Reset freesync config before update new state"")).

> 
> Reviewed-by: Sun peng Li <sunpeng.li at amd.com>
> Signed-off-by: Jerry Zuo <jerry.zuo at amd.com>
> Signed-off-by: Tom Chung <chiahsuan.chung at amd.com>
> Tested-by: Daniel Wheeler <daniel.wheeler at amd.com>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Sasha Levin <sashal at kernel.org>
> ---
>   drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> 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 f866a02f4f489..53a55270998cc 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -10028,6 +10028,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
>   	}
>   
>   	/* Update Freesync settings. */
> +	reset_freesync_config_for_crtc(dm_new_crtc_state);
>   	get_freesync_config_for_crtc(dm_new_crtc_state,
>   				     dm_new_conn_state);
>   
-- 
Hamza