On 2017-06-27 10:59 AM, Daniel Vetter wrote:
Too jarring.
Fixes: f869a6ecf254 ("drm/atomic: Add target_vblank support in atomic helpers (v2)") Cc: Andrey Grodzovsky Andrey.Grodzovsky@amd.com Cc: Alex Deucher alexander.deucher@amd.com Signed-off-by: Daniel Vetter daniel.vetter@intel.com
Reviewed-by: Harry Wentland harry.wentland@amd.com
Harry
drivers/gpu/drm/drm_atomic_helper.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 2f269e4267da..5a80b6960ae1 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -2964,12 +2964,11 @@ drm_atomic_helper_connector_set_property(struct drm_connector *connector, } EXPORT_SYMBOL(drm_atomic_helper_connector_set_property);
-static int page_flip_common(
struct drm_atomic_state *state,struct drm_crtc *crtc,struct drm_framebuffer *fb,struct drm_pending_vblank_event *event,uint32_t flags)+static int page_flip_common(struct drm_atomic_state *state,
struct drm_crtc *crtc,struct drm_framebuffer *fb,struct drm_pending_vblank_event *event,uint32_t flags){ struct drm_plane *plane = crtc->primary; struct drm_plane_state *plane_state; @@ -3063,13 +3062,12 @@ EXPORT_SYMBOL(drm_atomic_helper_page_flip);
- Returns:
- Returns 0 on success, negative errno numbers on failure.
*/ -int drm_atomic_helper_page_flip_target(
struct drm_crtc *crtc,struct drm_framebuffer *fb,struct drm_pending_vblank_event *event,uint32_t flags,uint32_t target,struct drm_modeset_acquire_ctx *ctx)+int drm_atomic_helper_page_flip_target(struct drm_crtc *crtc,
struct drm_framebuffer *fb,struct drm_pending_vblank_event *event,uint32_t flags,uint32_t target,struct drm_modeset_acquire_ctx *ctx){ struct drm_plane *plane = crtc->primary; struct drm_atomic_state *state;