drm: add asynchrounous plane update
Subsystems (5)
v4 cover drm: add asynchrounous plane update
From: Gustavo Padovan <[email protected]>
Hi,
Follow up after Daniel's comments. Here I move the common async code to drm_atomic_helper.c. i915 and msm now have to call the drm_atomic_helper_async_check() themselves.
Please review! Thanks.
Gustavo
Gustavo Padovan (6):
drm/atomic: initial support for asynchronous plane update drm/i915: update cursors asynchronously through atomic drm/i915: remove intel_cursor_plane_funcs drm/msm: update cursors asynchronously through atomic drm/msm: remove mdp5_cursor_plane_funcs
drm/vc4: update cursors asynchronously through atomic
drivers/gpu/drm/drm_atomic_helper.c | 122 +++++++++++++++++++++ drivers/gpu/drm/i915/intel_atomic_plane.c | 73 +++++++++++++ drivers/gpu/drm/i915/intel_display.c | 163 +++++----------------------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 175 +++++++++++------------------- drivers/gpu/drm/msm/msm_atomic.c | 9 ++ drivers/gpu/drm/vc4/vc4_kms.c | 20 ++++ drivers/gpu/drm/vc4/vc4_plane.c | 128 +++++++++------------- include/drm/drm_atomic.h | 2 + include/drm/drm_atomic_helper.h | 4 + include/drm/drm_modeset_helper_vtables.h | 50 +++++++++ 10 files changed, 423 insertions(+), 323 deletions(-)
Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 1/6 drm/atomic: initial support for asynchronous plane update
From: Gustavo Padovan <[email protected]>
In some cases, like cursor updates, it is interesting to update the plane in an asynchronous fashion to avoid big delays. The current queued update could be still waiting for a fence to signal and thus block any subsequent update until its scan out. In cases like this if we update the cursor synchronously through the atomic API it will cause significant delays that would even be noticed by the final user.
This patch creates a fast path to jump ahead the current queued state and do single planes updates without going through all atomic steps in drm_atomic_helper_commit(). We take this path for legacy cursor updates.
For now only single plane updates are supported, but we plan to support multiple planes updates and async PageFlips through this interface as well in the near future.
v6: - move check code to drm_atomic_helper.c (Daniel Vetter)
v5:
- improve comments (Eric Anholt)
v4:
- fix state->crtc NULL check (Archit Taneja)
v3:
- fix iteration on the wrong crtc state
- put back code to forbid updates if there is a queued update for the same plane (Ville Syrjälä)
- move size checks back to drivers (Ville Syrjälä)
- move ASYNC_UPDATE flag addition to its own patch (Ville Syrjälä)
v2:
- allow updates even if there is a queued update for the same plane.
- fixes on the documentation (Emil Velikov)
- unconditionally call ->atomic_async_update (Emil Velikov)
- check for ->atomic_async_update earlier (Daniel Vetter)
- make ->atomic_async_check() the last step (Daniel Vetter)
- add ASYNC_UPDATE flag (Eric Anholt)
- update state in core after ->atomic_async_update (Eric Anholt)
- update docs (Eric Anholt)
--- drivers/gpu/drm/drm_atomic_helper.c | 122 +++++++++++++++++++++++++++++++ include/drm/drm_atomic.h | 2 + include/drm/drm_atomic_helper.h | 4 + include/drm/drm_modeset_helper_vtables.h | 50 +++++++++++++ 4 files changed, 178 insertions(+)
drivers/gpu/drm/drm_atomic_helper.c +122 -0
@@ -795,6 +795,9 @@ int drm_atomic_helper_check(struct drm_device *dev,if (ret)return ret; +if (state->legacy_cursor_update) + state->async_update = !drm_atomic_helper_async_check (dev, state); +return ret; }EXPORT_SYMBOL (drm_atomic_helper_check);
@@ -1353,6 +1356,114 @@ static void commit_work(struct work_struct *work) }/** +* drm_atomic_helper_async_check - check if state can be commited asynchronously +* @dev: DRM device +* @state: the driver state object +* +* This helper will check if it is possible to commit the state asynchronously. +* Async commits are not supposed to swap the states like normal sync commits +* but just do in-place changes on the current state. +* +* It will return 0 if the commit can happen in an asynchronous fashion or error +* if not. Note that error just mean it can't be commited asynchronously, if it +* fails the commit should be treated like a normal synchronous commit. +*/ +int drm_atomic_helper_async_check (struct drm_device *dev, +struct drm_atomic_state *state) +{ +struct drm_crtc *crtc; +struct drm_crtc_state *crtc_state; +struct drm_crtc_commit *commit; +struct drm_plane *__plane, *plane =NULL ; +struct drm_plane_state *__plane_state, *plane_state =NULL ; +const struct drm_plane_helper_funcs *funcs; +int i, j, n_planes =0 ; + +for_each_new_crtc_in_state (state, crtc, crtc_state, i) { +if (drm_atomic_crtc_needs_modeset (crtc_state)) +return -EINVAL ; + } + +for_each_new_plane_in_state (state, __plane, __plane_state, i) { + n_planes++; + plane = __plane; + plane_state = __plane_state; + } + +/* FIXME: we support only single plane updates for now */ +if (!plane || n_planes !=1 ) +return -EINVAL ; + +if (!plane_state->crtc) +return -EINVAL ; + + funcs = plane->helper_private; +if (!funcs->atomic_async_update) +return -EINVAL ; + +if (plane_state->fence) +return -EINVAL ; + +/* +* Don't do an async update if there is an outstanding commit modifying +* the plane. This prevents our async update's changes from getting +* overridden by a previous synchronous update's state. +*/ +for_each_new_crtc_in_state (state, crtc, crtc_state, i) { +if (plane->crtc != crtc) +continue ; + +spin_lock (&crtc->commit_lock); + commit =list_first_entry_or_null (&crtc->commit_list, + struct drm_crtc_commit, + commit_entry); +if (!commit) { +spin_unlock (&crtc->commit_lock); +continue ; + } +spin_unlock (&crtc->commit_lock); + +if (!crtc->state->state) +continue ; + +for_each_plane_in_state (crtc->state->state, __plane, + __plane_state, j) { +if (__plane == plane) +return -EINVAL ; + } + } + +return funcs->atomic_async_check (plane, plane_state); +} +EXPORT_SYMBOL (drm_atomic_helper_async_check); + +/** +* drm_atomic_helper_async_commit - commit state asynchronously +* @dev: DRM device +* @state: the driver state object +* +* This function commits a state asynchronously, i.e., not vblank +* synchronized. It should be used on a state only when +* drm_atomic_async_check() succeeds. Async commits are not supposed to swap +* the states like normal sync commits, but just do in-place changes on the +* current state. +*/ +void drm_atomic_helper_async_commit (struct drm_device *dev, +struct drm_atomic_state *state) +{ +struct drm_plane *plane; +struct drm_plane_state *plane_state; +const struct drm_plane_helper_funcs *funcs; +int i; + +for_each_new_plane_in_state (state, plane, plane_state, i) { + funcs = plane->helper_private; + funcs->atomic_async_update (plane, plane_state); + } +} +EXPORT_SYMBOL (drm_atomic_helper_async_commit); + +/** * drm_atomic_helper_commit - commit validated state object * @dev: DRM device * @state: the driver state object
@@ -1376,6 +1487,17 @@ int drm_atomic_helper_commit(struct drm_device *dev, {int ret; +if (state->async_update) { + ret =drm_atomic_helper_prepare_planes (dev, state); +if (ret) +return ret; + +drm_atomic_helper_async_commit (dev, state); +drm_atomic_helper_cleanup_planes (dev, state); + +return 0 ; + } + ret =drm_atomic_helper_setup_commit (state, nonblock);if (ret)return ret;
include/drm/drm_atomic.h +2 -0
@@ -207,6 +207,7 @@ struct __drm_private_objs_state {* @dev: parent DRM device * @allow_modeset: allow full modeset * @legacy_cursor_update: hint to enforce legacy cursor IOCTL semantics +* @async_update: hint for asynchronous plane update * @planes: pointer to array of structures with per-plane data * @crtcs: pointer to array of CRTC pointers * @num_connector: size of the @connectors and @connector_states arrays
@@ -221,6 +222,7 @@ struct drm_atomic_state {struct drm_device *dev; bool allow_modeset : 1; bool legacy_cursor_update : 1; + bool async_update : 1;struct __drm_planes_state *planes;struct __drm_crtcs_state *crtcs;int num_connector;
include/drm/drm_atomic_helper.h +4 -0
@@ -44,6 +44,10 @@ void drm_atomic_helper_commit_tail(struct drm_atomic_state *state);int drm_atomic_helper_commit (struct drm_device *dev,struct drm_atomic_state *state,bool nonblock); +int drm_atomic_helper_async_check (struct drm_device *dev, +struct drm_atomic_state *state); +void drm_atomic_helper_async_commit (struct drm_device *dev, +struct drm_atomic_state *state); int drm_atomic_helper_wait_for_fences(struct drm_device *dev, struct drm_atomic_state *state,
include/drm/drm_modeset_helper_vtables.h +50 -0
56 lines not on this page · raw message
Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v4 1/6] drm/atomic: initial support for asynchronous plane update
Quoted 43 lines · Gustavo Padovan
From: Gustavo Padovan <[email protected]>
In some cases, like cursor updates, it is interesting to update the plane in an asynchronous fashion to avoid big delays. The current queued update could be still waiting for a fence to signal and thus block any subsequent update until its scan out. In cases like this if we update the cursor synchronously through the atomic API it will cause significant delays that would even be noticed by the final user.
This patch creates a fast path to jump ahead the current queued state and do single planes updates without going through all atomic steps in
drm_atomic_helper_commit(). We take this path for legacy cursor updates.For now only single plane updates are supported, but we plan to support multiple planes updates and async PageFlips through this interface as well in the near future.
v6: - move check code to
drm_atomic_helper.c(Daniel Vetter)v5:
- improve comments (Eric Anholt)v4:
- fixstate->crtcNULL check (Archit Taneja)v3:
- fix iteration on the wrong crtc state
- put back code to forbid updates if there is a queued update for the same plane (Ville Syrjälä)
- move size checks back to drivers (Ville Syrjälä)
- moveASYNC_UPDATEflag addition to its own patch (Ville Syrjälä)v2:
- allow updates even if there is a queued update for the same plane.
- fixes on the documentation (Emil Velikov)
- unconditionally call ->atomic_async_update (Emil Velikov)
- check for ->atomic_async_update earlier (Daniel Vetter)
- make ->atomic_async_check() the last step (Daniel Vetter)
- addASYNC_UPDATEflag (Eric Anholt)
- update state in core after ->atomic_async_update (Eric Anholt)
- update docs (Eric Anholt)
Quoted 7 lines
Cc Daniel Vetter <[email protected]>Cc Rob Clark <[email protected]>Cc Eric Anholt <[email protected]>Signed-off-by Gustavo Padovan <[email protected]>Reviewed-by Archit Taneja <[email protected]> (v5)Acked-by Eric Anholt <[email protected]> (v5)Reviewed-by Daniel Vetter <[email protected]>
Applied to drm-misc-next, I think this is a very good base to build more async commit on top. We'll probably have to clarify what exactly this means (and encode that in more helpers) in the future ...
Thanks for doing this.
-Daniel
Quoted 257 lines
--- drivers/gpu/drm/drm_atomic_helper.c | 122 +++++++++++++++++++++++++++++++ include/drm/drm_atomic.h | 2 + include/drm/drm_atomic_helper.h | 4 + include/drm/drm_modeset_helper_vtables.h | 50 +++++++++++++ 4 files changed, 178 insertions(+)drivers/gpu/drm/drm_atomic_helper.c +122
-0@@ -795,6 +795,9 @@ int drm_atomic_helper_check(struct drm_device *dev,if (ret)return ret; +if (state->legacy_cursor_update) + state->async_update = !drm_atomic_helper_async_check (dev, state); +return ret; }EXPORT_SYMBOL (drm_atomic_helper_check);@@ -1353,6 +1356,114 @@ static void commit_work(struct work_struct *work) }/** +* drm_atomic_helper_async_check - check if state can be commited asynchronously +* @dev: DRM device +* @state: the driver state object +* +* This helper will check if it is possible to commit the state asynchronously. +* Async commits are not supposed to swap the states like normal sync commits +* but just do in-place changes on the current state. +* +* It will return 0 if the commit can happen in an asynchronous fashion or error +* if not. Note that error just mean it can't be commited asynchronously, if it +* fails the commit should be treated like a normal synchronous commit. +*/ +int drm_atomic_helper_async_check (struct drm_device *dev, +struct drm_atomic_state *state) +{ +struct drm_crtc *crtc; +struct drm_crtc_state *crtc_state; +struct drm_crtc_commit *commit; +struct drm_plane *__plane, *plane =NULL ; +struct drm_plane_state *__plane_state, *plane_state =NULL ; +const struct drm_plane_helper_funcs *funcs; +int i, j, n_planes =0 ; + +for_each_new_crtc_in_state (state, crtc, crtc_state, i) { +if (drm_atomic_crtc_needs_modeset (crtc_state)) +return -EINVAL ; + } + +for_each_new_plane_in_state (state, __plane, __plane_state, i) { + n_planes++; + plane = __plane; + plane_state = __plane_state; + } + +/* FIXME: we support only single plane updates for now */ +if (!plane || n_planes !=1 ) +return -EINVAL ; + +if (!plane_state->crtc) +return -EINVAL ; + + funcs = plane->helper_private; +if (!funcs->atomic_async_update) +return -EINVAL ; + +if (plane_state->fence) +return -EINVAL ; + +/* +* Don't do an async update if there is an outstanding commit modifying +* the plane. This prevents our async update's changes from getting +* overridden by a previous synchronous update's state. +*/ +for_each_new_crtc_in_state (state, crtc, crtc_state, i) { +if (plane->crtc != crtc) +continue ; + +spin_lock (&crtc->commit_lock); + commit =list_first_entry_or_null (&crtc->commit_list, + struct drm_crtc_commit, + commit_entry); +if (!commit) { +spin_unlock (&crtc->commit_lock); +continue ; + } +spin_unlock (&crtc->commit_lock); + +if (!crtc->state->state) +continue ; + +for_each_plane_in_state (crtc->state->state, __plane, + __plane_state, j) { +if (__plane == plane) +return -EINVAL ; + } + } + +return funcs->atomic_async_check (plane, plane_state); +} +EXPORT_SYMBOL (drm_atomic_helper_async_check); + +/** +* drm_atomic_helper_async_commit - commit state asynchronously +* @dev: DRM device +* @state: the driver state object +* +* This function commits a state asynchronously, i.e., not vblank +* synchronized. It should be used on a state only when +* drm_atomic_async_check() succeeds. Async commits are not supposed to swap +* the states like normal sync commits, but just do in-place changes on the +* current state. +*/ +void drm_atomic_helper_async_commit (struct drm_device *dev, +struct drm_atomic_state *state) +{ +struct drm_plane *plane; +struct drm_plane_state *plane_state; +const struct drm_plane_helper_funcs *funcs; +int i; + +for_each_new_plane_in_state (state, plane, plane_state, i) { + funcs = plane->helper_private; + funcs->atomic_async_update (plane, plane_state); + } +} +EXPORT_SYMBOL (drm_atomic_helper_async_commit); + +/** * drm_atomic_helper_commit - commit validated state object * @dev: DRM device * @state: the driver state object @@ -1376,6 +1487,17 @@ int drm_atomic_helper_commit(struct drm_device *dev, {int ret; +if (state->async_update) { + ret =drm_atomic_helper_prepare_planes (dev, state); +if (ret) +return ret; + +drm_atomic_helper_async_commit (dev, state); +drm_atomic_helper_cleanup_planes (dev, state); + +return 0 ; + } + ret =drm_atomic_helper_setup_commit (state, nonblock);if (ret)return ret;include/drm/drm_atomic.h +2
-0@@ -207,6 +207,7 @@ struct __drm_private_objs_state {* @dev: parent DRM device * @allow_modeset: allow full modeset * @legacy_cursor_update: hint to enforce legacy cursor IOCTL semantics +* @async_update: hint for asynchronous plane update * @planes: pointer to array of structures with per-plane data * @crtcs: pointer to array of CRTC pointers * @num_connector: size of the @connectors and @connector_states arrays @@ -221,6 +222,7 @@ struct drm_atomic_state {struct drm_device *dev; bool allow_modeset : 1; bool legacy_cursor_update : 1; + bool async_update : 1;struct __drm_planes_state *planes;struct __drm_crtcs_state *crtcs;int num_connector;include/drm/drm_atomic_helper.h +4
-0@@ -44,6 +44,10 @@ void drm_atomic_helper_commit_tail(struct drm_atomic_state *state);int drm_atomic_helper_commit (struct drm_device *dev,struct drm_atomic_state *state,bool nonblock); +int drm_atomic_helper_async_check (struct drm_device *dev, +struct drm_atomic_state *state); +void drm_atomic_helper_async_commit (struct drm_device *dev, +struct drm_atomic_state *state); int drm_atomic_helper_wait_for_fences(struct drm_device *dev, struct drm_atomic_state *state,include/drm/drm_modeset_helper_vtables.h +50
-0@@ -1135,6 +1135,56 @@ struct drm_plane_helper_funcs {*/ void (*atomic_disable)(struct drm_plane *plane,struct drm_plane_state *old_state); + +/** +* @atomic_async_check: +* +* Drivers should set this function pointer to check if the plane state +* can be updated in a async fashion. Here async means "not vblank +* synchronized". +* +* This hook is called by drm_atomic_async_check() to establish if a +* given update can be committed asynchronously, that is, if it can +* jump ahead of the state currently queued for update. +* +* RETURNS: +* +* Return 0 on success and any error returned indicates that the update +* can not be applied in asynchronous manner. +*/ +int (*atomic_async_check)(struct drm_plane *plane, +struct drm_plane_state *state); + +/** +* @atomic_async_update: +* +* Drivers should set this function pointer to perform asynchronous +* updates of planes, that is, jump ahead of the currently queued +* state and update the plane. Here async means "not vblank +* synchronized". +* +* This hook is called by drm_atomic_helper_async_commit(). +* +* An async update will happen on legacy cursor updates. An async +* update won't happen if there is an outstanding commit modifying +* the same plane. +* +* Note that unlike &drm_plane_helper_funcs.atomic_update this hook +* takes the new &drm_plane_state as parameter. When doing async_update +* drivers shouldn't replace the &drm_plane_state but update the +* current one with the new plane configurations in the new +* plane_state. +* +* FIXME: +* - It only works for single plane updates +* - Async Pageflips are not supported yet +* - Some hw might still scan out the old buffer until the next +* vblank, however we let go of the fb references as soon as +* we run this hook. For now drivers must implement their own workers +* for deferring if needed, until a common solution is created. +*/ +void (*atomic_async_update)(struct drm_plane *plane, +struct drm_plane_state *new_state); };/** Signature · 6 lines
2.9.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 2/6 drm/i915: update cursors asynchronously through atomic
In reply to Gustavo PadovanFrom: Gustavo Padovan <[email protected]>
Add support to async updates of cursors by using the new atomic interface for that. Basically what this commit does is do what intel_legacy_cursor_update() did but through atomic.
v4:
- call drm_atomic_helper_async_check() from the check hook
v3:
- set correct vma to new state for cleanup
- move size checks back to drivers (Ville Syrjälä)
v2:
- move fb setting to core and use new state (Eric Anholt)
--- drivers/gpu/drm/i915/intel_atomic_plane.c | 73 ++++++++++++++ drivers/gpu/drm/i915/intel_display.c | 152 ++++++------------------------ 2 files changed, 100 insertions(+), 125 deletions(-)
drivers/gpu/drm/i915/intel_atomic_plane.c +73 -0
@@ -230,11 +230,84 @@ static void intel_plane_atomic_update(struct drm_plane *plane, } } +static int intel_plane_atomic_async_check (struct drm_plane *plane, +struct drm_plane_state *state) +{ +struct drm_crtc *crtc = plane->state->crtc; +struct drm_crtc_state *crtc_state = crtc->state; + +if (plane->type !=DRM_PLANE_TYPE_CURSOR ) +return -EINVAL ; + +/* +* When crtc is inactive or there is a modeset pending, +* wait for it to complete in the slowpath +*/ +if (!crtc_state->active ||to_intel_crtc_state (crtc_state)->update_pipe) +return -EINVAL ; + +/* +* If any parameters change that may affect watermarks, +* take the slowpath. Only changing fb or position should be +* in the fastpath. +*/ +if (plane->state->crtc != state->crtc || + plane->state->src_w != state->src_w || + plane->state->src_h != state->src_h || + plane->state->crtc_w != state->crtc_w || + plane->state->crtc_h != state->crtc_h || + !plane->state->fb != !state->fb) +return -EINVAL ; + +return 0 ; +} + +static void intel_plane_atomic_async_update (struct drm_plane *plane, +struct drm_plane_state *new_state) +{ +struct intel_plane *intel_plane =to_intel_plane (plane); +struct drm_crtc *crtc = plane->state->crtc; +struct drm_framebuffer *old_fb; +struct i915_vma *old_vma; + + old_vma =to_intel_plane_state (plane->state)->vma; + old_fb = plane->state->fb; + +i915_gem_track_fb (intel_fb_obj (old_fb),intel_fb_obj (new_state->fb), + intel_plane->frontbuffer_bit); + + plane->state->src_x = new_state->src_x; + plane->state->src_y = new_state->src_y; + plane->state->crtc_x = new_state->crtc_x; + plane->state->crtc_y = new_state->crtc_y; + plane->state->fb = new_state->fb; + *to_intel_plane_state (plane->state) = *to_intel_plane_state (new_state); + +to_intel_plane_state (new_state)->vma = old_vma; + new_state->fb = old_fb; + +if (plane->state->visible) { +trace_intel_update_plane (plane,to_intel_crtc (crtc)); + intel_plane->update_plane (intel_plane, +to_intel_crtc_state (crtc->state), +to_intel_plane_state (plane->state)); + }else { +trace_intel_disable_plane (plane,to_intel_crtc (crtc)); + intel_plane->disable_plane (intel_plane,to_intel_crtc (crtc)); + } + +mutex_lock (&plane->dev->struct_mutex); +intel_cleanup_plane_fb (plane, new_state); +mutex_unlock (&plane->dev->struct_mutex); +} +const struct drm_plane_helper_funcs intel_plane_helper_funcs = { .prepare_fb = intel_prepare_plane_fb, .cleanup_fb = intel_cleanup_plane_fb, .atomic_check = intel_plane_atomic_check, .atomic_update = intel_plane_atomic_update, + .atomic_async_check = intel_plane_atomic_async_check, + .atomic_async_update = intel_plane_atomic_async_update, };/**
drivers/gpu/drm/i915/intel_display.c +27 -125
177 lines not on this page · raw message
Signature · 6 lines
2.9.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v4 3/6 drm/i915: remove intel_cursor_plane_funcs
In reply to Gustavo PadovanFrom: Gustavo Padovan <[email protected]>
After converting legacy cursor updates to atomic async commits intel_cursor_plane_funcs just duplicates intel_plane_funcs now.
--- drivers/gpu/drm/i915/intel_display.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
drivers/gpu/drm/i915/intel_display.c +1 -12
@@ -13610,17 +13610,6 @@ const struct drm_plane_funcs intel_plane_funcs = { .atomic_destroy_state = intel_plane_destroy_state, }; -static const struct drm_plane_funcs intel_cursor_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = intel_plane_destroy, - .set_property = drm_atomic_helper_plane_set_property, - .atomic_get_property = intel_plane_atomic_get_property, - .atomic_set_property = intel_plane_atomic_set_property, - .atomic_duplicate_state = intel_plane_duplicate_state, - .atomic_destroy_state = intel_plane_destroy_state, -}; -static struct intel_plane *intel_primary_plane_create (struct drm_i915_private *dev_priv,enum pipe pipe) {
@@ -13782,7 +13771,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, cursor->cursor.size = ~0 ; ret = drm_universal_plane_init(&dev_priv->drm, &cursor->base, - 0, &intel_cursor_plane_funcs, + 0, &intel_plane_funcs, intel_cursor_formats, ARRAY_SIZE(intel_cursor_formats), DRM_PLANE_TYPE_CURSOR,
Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 4/6 drm/msm: update cursors asynchronously through atomic
In reply to Gustavo PadovanFrom: Gustavo Padovan <[email protected]>
Add support to async updates of cursors by using the new atomic interface for that. Basically what this commit does is do what mdp5_update_cursor_plane_legacy() did but through atomic.
v5: call drm_atomic_helper_async_check() from the check hook
v4: add missing atomic async commit call to msm_atomic_commit(Archit Taneja)
v3: move size checks back to drivers (Ville Syrjälä)
v2: move fb setting to core and use new state (Eric Anholt)
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 151 +++++++++++++----------------- drivers/gpu/drm/msm/msm_atomic.c | 9 ++ 2 files changed, 72 insertions(+), 88 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +63 -88
@@ -31,15 +31,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane, struct drm_crtc *crtc, struct drm_framebuffer *fb, struct drm_rect *src, struct drm_rect *dest); -static int mdp5_update_cursor_plane_legacy (struct drm_plane *plane, -struct drm_crtc *crtc, -struct drm_framebuffer *fb, -int crtc_x,int crtc_y, -unsigned int crtc_w,unsigned int crtc_h, -uint32_t src_x,uint32_t src_y, -uint32_t src_w,uint32_t src_h, -struct drm_modeset_acquire_ctx *ctx); -static struct mdp5_kms *get_kms (struct drm_plane *plane) {struct msm_drm_private *priv = plane->dev->dev_private;
@@ -256,7 +247,7 @@ static const struct drm_plane_funcs mdp5_plane_funcs = { };static const struct drm_plane_funcs mdp5_cursor_plane_funcs = { - .update_plane = mdp5_update_cursor_plane_legacy, + .update_plane = drm_atomic_helper_update_plane, .disable_plane = drm_atomic_helper_disable_plane, .destroy = mdp5_plane_destroy, .set_property = drm_atomic_helper_plane_set_property,
@@ -489,11 +480,73 @@ static void mdp5_plane_atomic_update(struct drm_plane *plane, } } +static int mdp5_plane_atomic_async_check (struct drm_plane *plane, +struct drm_plane_state *state) +{ +struct mdp5_plane_state *mdp5_state =to_mdp5_plane_state (state); +struct drm_crtc_state *crtc_state; + + crtc_state =drm_atomic_get_existing_crtc_state (state->state, + state->crtc); +if (WARN_ON (!crtc_state)) +return -EINVAL ; + +if (!crtc_state->active) +return -EINVAL ; + + mdp5_state =to_mdp5_plane_state (state); + +/* don't use fast path if we don't have a hwpipe allocated yet */ +if (!mdp5_state->hwpipe) +return -EINVAL ; + +/* only allow changing of position(crtc x/y or src x/y) in fast path */ +if (plane->state->crtc != state->crtc || + plane->state->src_w != state->src_w || + plane->state->src_h != state->src_h || + plane->state->crtc_w != state->crtc_w || + plane->state->crtc_h != state->crtc_h || + !plane->state->fb || + plane->state->fb != state->fb) +return -EINVAL ; + +return 0 ; +} + +static void mdp5_plane_atomic_async_update (struct drm_plane *plane, +struct drm_plane_state *new_state) +{ + plane->state->src_x = new_state->src_x; + plane->state->src_y = new_state->src_y; + plane->state->crtc_x = new_state->crtc_x; + plane->state->crtc_y = new_state->crtc_y; + +if (plane_enabled (new_state)) { +struct mdp5_ctl *ctl; +struct mdp5_pipeline *pipeline = +mdp5_crtc_get_pipeline (plane->crtc); +int ret; + + ret =mdp5_plane_mode_set (plane, new_state->crtc, new_state->fb, + &new_state->src, &new_state->dst); +WARN_ON (ret <0 ); + + ctl =mdp5_crtc_get_ctl (new_state->crtc); + +mdp5_ctl_commit (ctl, pipeline,mdp5_plane_get_flush (plane)); + } + + *to_mdp5_plane_state (plane->state) = + *to_mdp5_plane_state (new_state); +} +static const struct drm_plane_helper_funcs mdp5_plane_helper_funcs = { .prepare_fb = mdp5_plane_prepare_fb, .cleanup_fb = mdp5_plane_cleanup_fb, .atomic_check = mdp5_plane_atomic_check, .atomic_update = mdp5_plane_atomic_update, + .atomic_async_check = mdp5_plane_atomic_async_check, + .atomic_async_update = mdp5_plane_atomic_async_update, }; static void set_scanout_locked(struct mdp5_kms *mdp5_kms,
@@ -998,84 +1051,6 @@ static int mdp5_plane_mode_set(struct drm_plane *plane,return ret; } -static int mdp5_update_cursor_plane_legacy (struct drm_plane *plane, -struct drm_crtc *crtc,struct drm_framebuffer *fb, -int crtc_x,int crtc_y, -unsigned int crtc_w,unsigned int crtc_h, -uint32_t src_x,uint32_t src_y, -uint32_t src_w,uint32_t src_h, -struct drm_modeset_acquire_ctx *ctx) -{ -struct drm_plane_state *plane_state, *new_plane_state; -struct mdp5_plane_state *mdp5_pstate; -struct drm_crtc_state *crtc_state = crtc->state; -int ret; - -if (!crtc_state->active ||drm_atomic_crtc_needs_modeset (crtc_state)) - goto slow; - - plane_state = plane->state; - mdp5_pstate =to_mdp5_plane_state (plane_state); - -/* don't use fast path if we don't have a hwpipe allocated yet */ -if (!mdp5_pstate->hwpipe) - goto slow; - -/* only allow changing of position(crtc x/y or src x/y) in fast path */ -if (plane_state->crtc != crtc || - plane_state->src_w != src_w || - plane_state->src_h != src_h || - plane_state->crtc_w != crtc_w || - plane_state->crtc_h != crtc_h || - !plane_state->fb || - plane_state->fb != fb) - goto slow; - - new_plane_state =mdp5_plane_duplicate_state (plane); -if (!new_plane_state) -return -ENOMEM ; - - new_plane_state->src_x = src_x; - new_plane_state->src_y = src_y; - new_plane_state->src_w = src_w; - new_plane_state->src_h = src_h; - new_plane_state->crtc_x = crtc_x; - new_plane_state->crtc_y = crtc_y; - new_plane_state->crtc_w = crtc_w; - new_plane_state->crtc_h = crtc_h; - - ret =mdp5_plane_atomic_check_with_state (crtc_state, new_plane_state); -if (ret) - goto slow_free; - -if (new_plane_state->visible) { -struct mdp5_ctl *ctl; -struct mdp5_pipeline *pipeline =mdp5_crtc_get_pipeline (crtc); - - ret =mdp5_plane_mode_set (plane, crtc, fb, - &new_plane_state->src, - &new_plane_state->dst); -WARN_ON (ret <0 ); - - ctl =mdp5_crtc_get_ctl (crtc); - -mdp5_ctl_commit (ctl, pipeline,mdp5_plane_get_flush (plane)); - } - - *to_mdp5_plane_state (plane_state) = - *to_mdp5_plane_state (new_plane_state); - -mdp5_plane_destroy_state (plane, new_plane_state); - -return 0 ; -slow_free: -mdp5_plane_destroy_state (plane, new_plane_state); -slow: -return drm_atomic_helper_update_plane (plane, crtc, fb, - crtc_x, crtc_y, crtc_w, crtc_h, - src_x, src_y, src_w, src_h, ctx); -} -/* * Use this func and the one below only after the atomic state has been * successfully swapped
drivers/gpu/drm/msm/msm_atomic.c +9 -0
@@ -172,6 +172,9 @@ int msm_atomic_check(struct drm_device *dev,if (ret)return ret; +if (state->legacy_cursor_update) + state->async_update = !drm_atomic_helper_async_check (dev, state); +return ret; }
@@ -202,6 +205,12 @@ int msm_atomic_commit(struct drm_device *dev,if (ret)return ret; +if (state->async_update) { +drm_atomic_helper_async_commit (dev, state); +drm_atomic_helper_cleanup_planes (dev, state); +return 0 ; + } + c =commit_init (state);if (!c) { ret = -ENOMEM ;
Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 5/6 drm/msm: remove mdp5_cursor_plane_funcs
In reply to Gustavo PadovanFrom: Gustavo Padovan <[email protected]>
After converting legacy cursor updates to atomic async commits mdp5_cursor_plane_funcs just duplicates mdp5_plane_funcs now.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +3 -23
@@ -246,19 +246,6 @@ static const struct drm_plane_funcs mdp5_plane_funcs = { .atomic_print_state = mdp5_plane_atomic_print_state, }; -static const struct drm_plane_funcs mdp5_cursor_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = mdp5_plane_destroy, - .set_property = drm_atomic_helper_plane_set_property, - .atomic_set_property = mdp5_plane_atomic_set_property, - .atomic_get_property = mdp5_plane_atomic_get_property, - .reset = mdp5_plane_reset, - .atomic_duplicate_state = mdp5_plane_duplicate_state, - .atomic_destroy_state = mdp5_plane_destroy_state, - .atomic_print_state = mdp5_plane_atomic_print_state, -}; -static int mdp5_plane_prepare_fb (struct drm_plane *plane,struct drm_plane_state *new_state) {
@@ -1110,16 +1097,9 @@ struct drm_plane *mdp5_plane_init(struct drm_device *dev, mdp5_plane->nformats =mdp_get_formats (mdp5_plane->formats,ARRAY_SIZE (mdp5_plane->formats), false); -if (type ==DRM_PLANE_TYPE_CURSOR ) - ret =drm_universal_plane_init (dev, plane,0xff , - &mdp5_cursor_plane_funcs, - mdp5_plane->formats, mdp5_plane->nformats, - type,NULL ); -else - ret =drm_universal_plane_init (dev, plane,0xff , - &mdp5_plane_funcs, - mdp5_plane->formats, mdp5_plane->nformats, - type,NULL ); + ret =drm_universal_plane_init (dev, plane,0xff , &mdp5_plane_funcs, + mdp5_plane->formats, + mdp5_plane->nformats, type,NULL );if (ret) goto fail;
Signature · 6 lines
2.9.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v4 6/6 drm/vc4: update cursors asynchronously through atomic
In reply to Gustavo PadovanFrom: Gustavo Padovan <[email protected]>
Add support for async updates of cursors by using the new atomic interface for that. Basically what this commit does is do what vc4_update_plane() did but through atomic.
v5: add missing call to vc4_plane_atomic_check() (Eric Anholt)
v4: add drm_atomic_helper_async() commit (Eric Anholt)
v3: move size checks back to drivers (Ville Syrjälä)
v2: move fb setting to core and use new state (Eric Anholt)
--- drivers/gpu/drm/vc4/vc4_kms.c | 20 +++++++ drivers/gpu/drm/vc4/vc4_plane.c | 128 ++++++++++++++++------------------------ 2 files changed, 71 insertions(+), 77 deletions(-)
drivers/gpu/drm/vc4/vc4_kms.c +20 -0
@@ -95,6 +95,26 @@ static int vc4_atomic_commit(struct drm_device *dev,struct vc4_dev *vc4 =to_vc4_dev (dev);int ret; +if (state->async_update) { + ret =down_interruptible (&vc4->async_modeset); +if (ret) +return ret; + + ret =drm_atomic_helper_prepare_planes (dev, state); +if (ret) { +up (&vc4->async_modeset); +return ret; + } + +drm_atomic_helper_async_commit (dev, state); + +drm_atomic_helper_cleanup_planes (dev, state); + +up (&vc4->async_modeset); + +return 0 ; + } + ret =drm_atomic_helper_setup_commit (state, nonblock);if (ret)return ret;
drivers/gpu/drm/vc4/vc4_plane.c +51 -77
158 lines not on this page · raw message
Signature · 6 lines
2.9.4 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.BAT: failure for drm: add asynchrounous plane update (rev5)
In reply to Gustavo Padovan== Series Details ==
== Series Details ==
Series: drm: add asynchrounous plane update (rev5)
URL : https://patchwork.freedesktop.org/series/25814/
State : failure
== Summary ==
Series 25814v5 drm: add asynchrounous plane update
https://patchwork.freedesktop.org/api/1.0/series/25814/revisions/5/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-7560u) fdo#100125
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> INCOMPLETE (fi-blb-e6850)
pass -> INCOMPLETE (fi-pnv-d510)
Test prime_busy:
Subgroup basic-wait-after-default:
pass -> DMESG-WARN (fi-skl-6700hq) fdo#101515fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#101515 https://bugs.freedesktop.org/show_bug.cgi?id=101515
fi-bdw-5557u total:279 pass:264 dwarn:0 dfail:0 fail:3 skip:11 time:435s fi-bdw-gvtdvm total:279 pass:257 dwarn:8 dfail:0 fail:0 skip:14 time:429s fi-blb-e6850 total:200 pass:163 dwarn:1 dfail:0 fail:0 skip:35 fi-bsw-n3050 total:279 pass:239 dwarn:0 dfail:0 fail:3 skip:36 time:516s fi-bxt-j4205 total:279 pass:256 dwarn:0 dfail:0 fail:3 skip:19 time:502s fi-byt-j1900 total:279 pass:251 dwarn:0 dfail:0 fail:3 skip:24 time:482s fi-byt-n2820 total:279 pass:246 dwarn:1 dfail:0 fail:3 skip:28 time:478s fi-glk-2a total:279 pass:256 dwarn:0 dfail:0 fail:3 skip:19 time:585s fi-hsw-4770 total:279 pass:259 dwarn:0 dfail:0 fail:3 skip:16 time:429s fi-hsw-4770r total:279 pass:259 dwarn:0 dfail:0 fail:3 skip:16 time:412s fi-ilk-650 total:279 pass:225 dwarn:0 dfail:0 fail:3 skip:50 time:420s fi-ivb-3520m total:279 pass:257 dwarn:0 dfail:0 fail:3 skip:18 time:493s fi-ivb-3770 total:279 pass:257 dwarn:0 dfail:0 fail:3 skip:18 time:471s fi-kbl-7500u total:279 pass:257 dwarn:0 dfail:0 fail:3 skip:18 time:461s fi-kbl-7560u total:279 pass:265 dwarn:0 dfail:0 fail:3 skip:10 time:558s fi-kbl-r total:279 pass:256 dwarn:1 dfail:0 fail:3 skip:18 time:563s fi-pnv-d510 total:200 pass:162 dwarn:1 dfail:0 fail:0 skip:36 fi-skl-6260u total:279 pass:265 dwarn:0 dfail:0 fail:3 skip:10 time:449s fi-skl-6700hq total:279 pass:218 dwarn:2 dfail:0 fail:33 skip:24 time:331s fi-skl-6700k total:279 pass:257 dwarn:0 dfail:0 fail:3 skip:18 time:459s fi-skl-6770hq total:279 pass:265 dwarn:0 dfail:0 fail:3 skip:10 time:469s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:435s fi-snb-2520m total:279 pass:247 dwarn:0 dfail:0 fail:3 skip:28 time:537s fi-snb-2600 total:279 pass:246 dwarn:0 dfail:0 fail:3 skip:29 time:408s
6412bcb8e279d62b9d8ae2840712d6c85806369b drm-tip: 2017y-06m-30d-14h-56m-41s UTC integration manifest 3ce1e3d drm/vc4: update cursors asynchronously through atomic
e4a269c drm/msm: remove mdp5_cursor_plane_funcs
80359c8 drm/msm: update cursors asynchronously through atomic
179589c drm/i915: remove intel_cursor_plane_funcs
4abf84a drm/i915: update cursors asynchronously through atomic
b92fb29 drm/atomic: initial support for asynchronous plane update
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_5083/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx