Skip to content

Commit

Permalink
drm/atomic: Save flip flags in drm_crtc_state
Browse files Browse the repository at this point in the history
Allows using atomic flip helpers for drivers
using ASYNC flip.
Remove ASYNC_FLIP restriction in helpers and
caches the page flip flags in drm_crtc_state
to be used in the low level drivers.

v2:
Resending the patch since the original was broken.

v3:
Save flag in crtc_state instead of plane_state

v4:
Reset the flag before using again.

v5:
Fix type in header.
Rename the field to pageflip_flags.
Remove unrelated hunk.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Andrey Grodzovsky <Andrey.Grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1486072591-3893-2-git-send-email-Andrey.Grodzovsky@amd.com
  • Loading branch information
Andrey Grodzovsky authored and Alex Deucher committed Feb 3, 2017
1 parent bb18dfc commit 6cbe5c4
Showing 2 changed files with 14 additions and 15 deletions.
20 changes: 6 additions & 14 deletions drivers/gpu/drm/drm_atomic_helper.c
Original file line number Diff line number Diff line change
@@ -2718,7 +2718,8 @@ static int page_flip_common(
struct drm_atomic_state *state,
struct drm_crtc *crtc,
struct drm_framebuffer *fb,
struct drm_pending_vblank_event *event)
struct drm_pending_vblank_event *event,
uint32_t flags)
{
struct drm_plane *plane = crtc->primary;
struct drm_plane_state *plane_state;
@@ -2730,12 +2731,12 @@ static int page_flip_common(
return PTR_ERR(crtc_state);

crtc_state->event = event;
crtc_state->pageflip_flags = flags;

plane_state = drm_atomic_get_plane_state(state, plane);
if (IS_ERR(plane_state))
return PTR_ERR(plane_state);


ret = drm_atomic_set_crtc_for_plane(plane_state, crtc);
if (ret != 0)
return ret;
@@ -2762,10 +2763,6 @@ static int page_flip_common(
* Provides a default &drm_crtc_funcs.page_flip implementation
* using the atomic driver interface.
*
* Note that for now so called async page flips (i.e. updates which are not
* synchronized to vblank) are not supported, since the atomic interfaces have
* no provisions for this yet.
*
* Returns:
* Returns 0 on success, negative errno numbers on failure.
*
@@ -2781,17 +2778,14 @@ int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
struct drm_atomic_state *state;
int ret = 0;

if (flags & DRM_MODE_PAGE_FLIP_ASYNC)
return -EINVAL;

state = drm_atomic_state_alloc(plane->dev);
if (!state)
return -ENOMEM;

state->acquire_ctx = drm_modeset_legacy_acquire_ctx(crtc);

retry:
ret = page_flip_common(state, crtc, fb, event);
ret = page_flip_common(state, crtc, fb, event, flags);
if (ret != 0)
goto fail;

@@ -2846,17 +2840,14 @@ int drm_atomic_helper_page_flip_target(
struct drm_crtc_state *crtc_state;
int ret = 0;

if (flags & DRM_MODE_PAGE_FLIP_ASYNC)
return -EINVAL;

state = drm_atomic_state_alloc(plane->dev);
if (!state)
return -ENOMEM;

state->acquire_ctx = drm_modeset_legacy_acquire_ctx(crtc);

retry:
ret = page_flip_common(state, crtc, fb, event);
ret = page_flip_common(state, crtc, fb, event, flags);
if (ret != 0)
goto fail;

@@ -3056,6 +3047,7 @@ void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc,
state->color_mgmt_changed = false;
state->zpos_changed = false;
state->event = NULL;
state->pageflip_flags = 0;
}
EXPORT_SYMBOL(__drm_atomic_helper_crtc_duplicate_state);

9 changes: 8 additions & 1 deletion include/drm/drm_crtc.h
Original file line number Diff line number Diff line change
@@ -155,9 +155,16 @@ struct drm_crtc_state {
* Target vertical blank period when a page flip
* should take effect.
*/

u32 target_vblank;

/**
* @pageflip_flags:
*
* DRM_MODE_PAGE_FLIP_* flags, as passed to the page flip ioctl.
* Zero in any other case.
*/
u32 pageflip_flags;

/**
* @event:
*

0 comments on commit 6cbe5c4

Please sign in to comment.