drm/amd/display: Move drm_get_vblank from legacy code

Previously, we assumed that allow_modeset=false => page flip. This
assumption breaks when an atomic commit is submitted with allow_modeset
set to false, since the legacy flip code is never called (the legacy
code grabs the vblank reference).

Fix: Move drm_vblank_get() from amdgpu_atomic_helper_page_flip() to
amdgpu_dm_commit_surfaces().

Signed-off-by: Leo (Sunpeng) Li <sunpeng.li@amd.com>
Reviewed-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 64cb635b4137cf1c69ccdeba4e9e65b7f08ddcd2..0978fe3e566375f16ed1770cd3e74e004678e3b8 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c
@@ -2383,8 +2383,6 @@ static void amdgpu_dm_commit_surfaces(struct drm_atomic_state *state,
                        if (!con_state)
                                continue;
 
-
-
                        add_surface(dm->dc, crtc, plane,
                                    &dc_surfaces_constructed[planes_count]);
                        if (dc_surfaces_constructed[planes_count] == NULL) {
@@ -2403,6 +2401,10 @@ static void amdgpu_dm_commit_surfaces(struct drm_atomic_state *state,
                                acrtc_attach->flip_flags & DRM_MODE_PAGE_FLIP_ASYNC ?
                                false : true;
 
+                       /* TODO: Needs rework for multiplane flip */
+                       if (plane->type == DRM_PLANE_TYPE_PRIMARY)
+                               drm_crtc_vblank_get(crtc);
+
                        amdgpu_dm_do_flip(
                                crtc,
                                fb,