drm/atomic: add commit_planes_on_crtc helper
Subsystems (2)
Maarten Lankhorst
maintainerPATCH 1/3 drm/atomic: add commit_planes_on_crtc helper
drm_atomic_helper_commit_planes calls all atomic_begin's first, then updates all planes, finally calling atomic_flush.
Some drivers may want to things like disabling irq's
from their atomic_begin, in which case a second call to atomic_begin will splat. By using commit_planes_on_crtc on each crtc in the atomic state they'll evade that issue.
--- drivers/gpu/drm/drm_atomic_helper.c | 53 +++++++++++++++++++++++++++++++++++++ include/drm/drm_atomic_helper.h | 1 + 2 files changed, 54 insertions(+)
drivers/gpu/drm/drm_atomic_helper.c +53 -0
@@ -1181,6 +1181,59 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,EXPORT_SYMBOL (drm_atomic_helper_commit_planes);/** +* drm_atomic_helper_commit_planes_on_crtc - commit plane state for a crtc +* @old_crtc_state: atomic state object with the old crtc state +* +* This function commits the new plane state using the plane and atomic helper +* functions for planes on the specific crtc. It assumes that the atomic state +* has already been pushed into the relevant object state pointers, since this +* step can no longer fail. +* +* This function can only be used when planes are not allowed to move between +* different crtc's. +*/ +void +drm_atomic_helper_commit_planes_on_crtc (struct drm_crtc_state *old_crtc_state) +{ +const struct drm_crtc_helper_funcs *crtc_funcs; +struct drm_crtc *crtc = old_crtc_state->crtc; +struct drm_atomic_state *old_state = old_crtc_state->state; +struct drm_plane *plane; +unsigned plane_mask; + + plane_mask = old_crtc_state->plane_mask; + plane_mask |= crtc->state->plane_mask; + + crtc_funcs = crtc->helper_private; +if (crtc_funcs && crtc_funcs->atomic_begin) + crtc_funcs->atomic_begin (crtc); + +drm_for_each_plane_mask (plane, crtc->dev, plane_mask) { +struct drm_plane_state *old_plane_state = +drm_atomic_get_existing_plane_state (old_state, plane); +const struct drm_plane_helper_funcs *plane_funcs; + + plane_funcs = plane->helper_private; + +if (!old_plane_state || !plane_funcs) +continue ; + +WARN_ON (plane->state->crtc && plane->state->crtc != crtc); + +if (drm_atomic_plane_disabling (plane, old_plane_state) && + plane_funcs->atomic_disable) + plane_funcs->atomic_disable (plane, old_plane_state); +else if (plane->state->crtc || +drm_atomic_plane_disabling (plane, old_plane_state)) + plane_funcs->atomic_update (plane, old_plane_state); + } + +if (crtc_funcs->atomic_flush) + crtc_funcs->atomic_flush (crtc); +} +EXPORT_SYMBOL (drm_atomic_helper_commit_planes_on_crtc); + +/** * drm_atomic_helper_cleanup_planes - cleanup plane resources after commit * @dev: DRM device * @old_state: atomic state object with old state structures
include/drm/drm_atomic_helper.h +1 -0
@@ -58,6 +58,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, struct drm_atomic_state *state);void drm_atomic_helper_cleanup_planes (struct drm_device *dev,struct drm_atomic_state *old_state); +void drm_atomic_helper_commit_planes_on_crtc (struct drm_crtc_state *old_crtc_state);void drm_atomic_helper_swap_state (struct drm_device *dev,struct drm_atomic_state *state);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH 2/3 drm/atomic: add drm_atomic_add_affected_planes
This is a convenience function to add all planes for a crtc, similar to add_affected_connectors. This will be used in drm_atomic_helper_check_modeset, but drivers can call it too when they need to recalculate all state.
--- drivers/gpu/drm/drm_atomic.c | 32 ++++++++++++++++++++++++++++++++ include/drm/drm_atomic.h | 4 ++++ 2 files changed, 36 insertions(+)
drivers/gpu/drm/drm_atomic.c +32 -0
@@ -956,6 +956,38 @@ drm_atomic_add_affected_connectors(struct drm_atomic_state *state,EXPORT_SYMBOL (drm_atomic_add_affected_connectors);/** +* drm_atomic_add_affected_planes - add planes for crtc +* @state: atomic state +* @crtc: DRM crtc +* +* This function walks the current configuration and adds all planes +* currently used by @crtc to the atomic configuration @state. +* +* Returns: +* 0 on success or can fail with -EDEADLK or -ENOMEM. When the error is EDEADLK +* then the w/w mutex code has detected a deadlock and the entire atomic +* sequence must be restarted. All other errors are fatal. +*/ +int +drm_atomic_add_affected_planes (struct drm_atomic_state *state, +struct drm_crtc *crtc) +{ +struct drm_plane *plane; + +WARN_ON (!drm_atomic_get_existing_crtc_state (state, crtc)); + +drm_for_each_plane_mask (plane, state->dev, crtc->state->plane_mask) { +struct drm_plane_state *plane_state = +drm_atomic_get_plane_state (state, plane); + +if (IS_ERR (plane_state)) +return PTR_ERR (plane_state); + } +return 0 ; +} +EXPORT_SYMBOL (drm_atomic_add_affected_planes); + +/** * drm_atomic_connectors_for_crtc - count number of connected outputs * @state: atomic state * @crtc: DRM crtc
include/drm/drm_atomic.h +4 -0
@@ -120,6 +120,10 @@ drm_atomic_set_crtc_for_connector(struct drm_connector_state *conn_state,int __must_check drm_atomic_add_affected_connectors (struct drm_atomic_state *state,struct drm_crtc *crtc); +int __must_check +drm_atomic_add_affected_planes (struct drm_atomic_state *state, +struct drm_crtc *crtc); +int drm_atomic_connectors_for_crtc (struct drm_atomic_state *state,struct drm_crtc *crtc);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Maarten Lankhorst
maintainerPATCH 3/3 drm/atomic: add all affected planes in drm_atomic_helper_check_modeset
In reply to Maarten LankhorstDrivers may need to recalculate plane state when a modeset occurs, not reliably adding them might cause hard to debug bugs.
--- drivers/gpu/drm/drm_atomic_helper.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/drm_atomic_helper.c +4 -0
@@ -429,6 +429,10 @@ drm_atomic_helper_check_modeset(struct drm_device *dev,if (ret !=0 )return ret; + ret =drm_atomic_add_affected_planes (state, crtc); +if (ret !=0 ) +return ret; + num_connectors =drm_atomic_connectors_for_crtc (state, crtc);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Maarten Lankhorst
drm_atomic_helper_commit_planescalls all atomic_begin's first, then updates all planes, finally callingatomic_flush.Some drivers may want to things like disabling irq's
from theiratomic_begin, in which case a second call toatomic_beginwill splat. By usingcommit_planes_on_crtcon each crtc in the atomic state they'll evade that issue.Signed-off-by Maarten Lankhorst <[email protected]>
All three patches merged to topic/drm-misc, thanks. -Daniel
Quoted 88 lines
--- drivers/gpu/drm/drm_atomic_helper.c | 53 +++++++++++++++++++++++++++++++++++++ include/drm/drm_atomic_helper.h | 1 + 2 files changed, 54 insertions(+)drivers/gpu/drm/drm_atomic_helper.c +53
-0@@ -1181,6 +1181,59 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,EXPORT_SYMBOL (drm_atomic_helper_commit_planes);/** +* drm_atomic_helper_commit_planes_on_crtc - commit plane state for a crtc +* @old_crtc_state: atomic state object with the old crtc state +* +* This function commits the new plane state using the plane and atomic helper +* functions for planes on the specific crtc. It assumes that the atomic state +* has already been pushed into the relevant object state pointers, since this +* step can no longer fail. +* +* This function can only be used when planes are not allowed to move between +* different crtc's. +*/ +void +drm_atomic_helper_commit_planes_on_crtc (struct drm_crtc_state *old_crtc_state) +{ +const struct drm_crtc_helper_funcs *crtc_funcs; +struct drm_crtc *crtc = old_crtc_state->crtc; +struct drm_atomic_state *old_state = old_crtc_state->state; +struct drm_plane *plane; +unsigned plane_mask; + + plane_mask = old_crtc_state->plane_mask; + plane_mask |= crtc->state->plane_mask; + + crtc_funcs = crtc->helper_private; +if (crtc_funcs && crtc_funcs->atomic_begin) + crtc_funcs->atomic_begin (crtc); + +drm_for_each_plane_mask (plane, crtc->dev, plane_mask) { +struct drm_plane_state *old_plane_state = +drm_atomic_get_existing_plane_state (old_state, plane); +const struct drm_plane_helper_funcs *plane_funcs; + + plane_funcs = plane->helper_private; + +if (!old_plane_state || !plane_funcs) +continue ; + +WARN_ON (plane->state->crtc && plane->state->crtc != crtc); + +if (drm_atomic_plane_disabling (plane, old_plane_state) && + plane_funcs->atomic_disable) + plane_funcs->atomic_disable (plane, old_plane_state); +else if (plane->state->crtc || +drm_atomic_plane_disabling (plane, old_plane_state)) + plane_funcs->atomic_update (plane, old_plane_state); + } + +if (crtc_funcs->atomic_flush) + crtc_funcs->atomic_flush (crtc); +} +EXPORT_SYMBOL (drm_atomic_helper_commit_planes_on_crtc); + +/** * drm_atomic_helper_cleanup_planes - cleanup plane resources after commit * @dev: DRM device * @old_state: atomic state object with old state structures include/drm/drm_atomic_helper.h +1
-0@@ -58,6 +58,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, struct drm_atomic_state *state);void drm_atomic_helper_cleanup_planes (struct drm_device *dev,struct drm_atomic_state *old_state); +void drm_atomic_helper_commit_planes_on_crtc (struct drm_crtc_state *old_crtc_state);void drm_atomic_helper_swap_state (struct drm_device *dev,struct drm_atomic_state *state);Signature · 6 lines
2.1.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel