Commit aac6a07e authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher

drm/amd/display: Use DRM provided page flip flag.

Starting with 4.12 kernel DRM provides page flip flags so we
don't need to have our own copy.
Signed-off-by: default avatarAndrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Reviewed-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e1b522bf
...@@ -3767,7 +3767,7 @@ static void amdgpu_dm_do_flip( ...@@ -3767,7 +3767,7 @@ static void amdgpu_dm_do_flip(
struct amdgpu_framebuffer *afb = to_amdgpu_framebuffer(fb); struct amdgpu_framebuffer *afb = to_amdgpu_framebuffer(fb);
struct amdgpu_bo *abo = gem_to_amdgpu_bo(afb->obj); struct amdgpu_bo *abo = gem_to_amdgpu_bo(afb->obj);
struct amdgpu_device *adev = crtc->dev->dev_private; struct amdgpu_device *adev = crtc->dev->dev_private;
bool async_flip = (acrtc->flip_flags & DRM_MODE_PAGE_FLIP_ASYNC) != 0; bool async_flip = (crtc->state->pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC) != 0;
struct dc_flip_addrs addr = { {0} }; struct dc_flip_addrs addr = { {0} };
/* TODO eliminate or rename surface_update */ /* TODO eliminate or rename surface_update */
struct dc_surface_update surface_updates[1] = { {0} }; struct dc_surface_update surface_updates[1] = { {0} };
...@@ -3899,7 +3899,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, ...@@ -3899,7 +3899,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
* TODO Check if it's correct * TODO Check if it's correct
*/ */
*wait_for_vblank = *wait_for_vblank =
acrtc_attach->flip_flags & DRM_MODE_PAGE_FLIP_ASYNC ? pcrtc->state->pageflip_flags & DRM_MODE_PAGE_FLIP_ASYNC ?
false : true; false : true;
/* TODO: Needs rework for multiplane flip */ /* TODO: Needs rework for multiplane flip */
...@@ -3910,11 +3910,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, ...@@ -3910,11 +3910,6 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state,
crtc, crtc,
fb, fb,
drm_crtc_vblank_count(crtc) + *wait_for_vblank); drm_crtc_vblank_count(crtc) + *wait_for_vblank);
/*TODO BUG remove ASAP in 4.12 to avoid race between worker and flip IOCTL */
/*clean up the flags for next usage*/
acrtc_attach->flip_flags = 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment