From: Andrey Grodzovsky <Andrey.Grodzovsky@xxxxxxx> You cannot have modeset and flip in the same call for same CRTC, in such case it will be set mode and set plane, not a flip. Change-Id: If7e7ef4a62dfc1c62b2a3fef63a4a6316d0155d3 Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky at amd.com> Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky at amd.com> Acked-by: Harry Wentland <Harry.Wentland at amd.com> --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c index 74981c24d6a6..5d34ce6c7faf 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c @@ -3296,15 +3296,9 @@ int amdgpu_dm_atomic_check(struct drm_device *dev, action = get_dm_commit_action(crtc->state); - /* Surfaces are created under two scenarios: - * 1. This commit is not a page flip. - * 2. This commit is a page flip, and streams are created. - */ crtc_state = drm_atomic_get_crtc_state(state, crtc); pflip_needed = !state->allow_modeset; - if (!pflip_needed || - action == DM_COMMIT_ACTION_DPMS_ON || - action == DM_COMMIT_ACTION_SET) { + if (!pflip_needed) { struct dc_surface *surface; list_for_each_entry(connector, -- 2.11.0