From: Leo (Sunpeng) Li Date: Tue, 25 Jul 2017 22:00:44 +0000 (-0400) Subject: drm/amd/display: Move drm_get_vblank from legacy code X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e29088b2932a11db6155212ca19c75029bc137aa;p=linux.git 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 Reviewed-by: Andrey Grodzovsky Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- 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 64cb635b4137c..0978fe3e56637 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 @@ -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,