| Message ID | 1432046463-8711-1-git-send-email-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, May 19, 2015 at 04:41:01PM +0200, Maarten Lankhorst wrote: > 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. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> All three patches merged to topic/drm-misc, thanks. -Daniel > --- > drivers/gpu/drm/drm_atomic_helper.c | 53 +++++++++++++++++++++++++++++++++++++ > include/drm/drm_atomic_helper.h | 1 + > 2 files changed, 54 insertions(+) > > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c > index b82ef6262469..2da8a16bb39e 100644 > --- a/drivers/gpu/drm/drm_atomic_helper.c > +++ b/drivers/gpu/drm/drm_atomic_helper.c > @@ -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 > diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h > index 6ee0ee5b6143..cc1fee8a12d0 100644 > --- a/include/drm/drm_atomic_helper.h > +++ b/include/drm/drm_atomic_helper.h > @@ -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); > -- > 2.1.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index b82ef6262469..2da8a16bb39e 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -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 diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 6ee0ee5b6143..cc1fee8a12d0 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -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);
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. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> --- drivers/gpu/drm/drm_atomic_helper.c | 53 +++++++++++++++++++++++++++++++++++++ include/drm/drm_atomic_helper.h | 1 + 2 files changed, 54 insertions(+)