On Fri, 2018-09-14 at 18:59 +0200, Lucas Stach wrote:
> This function allows upper layer to check if a requested atomic update
> to the plane has been applied or is still pending.
>
> Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/imx/ipuv3-plane.c | 20 ++++++++++++++++++++
> drivers/gpu/drm/imx/ipuv3-plane.h | 2 ++
> 2 files changed, 22 insertions(+)
>
> diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
> index 203f247d4854..c95a2fc51741 100644
> --- a/drivers/gpu/drm/imx/ipuv3-plane.c
> +++ b/drivers/gpu/drm/imx/ipuv3-plane.c
> @@ -587,6 +587,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
> active = ipu_idmac_get_current_buffer(ipu_plane->ipu_ch);
> ipu_cpmem_set_buffer(ipu_plane->ipu_ch, !active, eba);
> ipu_idmac_select_buffer(ipu_plane->ipu_ch, !active);
> + ipu_plane->next_buf = !active;
> if (ipu_plane_separate_alpha(ipu_plane)) {
> active = ipu_idmac_get_current_buffer(ipu_plane->alpha_ch);
> ipu_cpmem_set_buffer(ipu_plane->alpha_ch, !active,
> @@ -713,6 +714,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
> ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 0, eba);
> ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 1, eba);
> ipu_idmac_lock_enable(ipu_plane->ipu_ch, num_bursts);
> + ipu_plane->next_buf = -1;
> ipu_plane_enable(ipu_plane);
> }
>
> @@ -723,6 +725,24 @@ static const struct drm_plane_helper_funcs ipu_plane_helper_funcs = {
> .atomic_update = ipu_plane_atomic_update,
> };
>
> +bool ipu_plane_atomic_update_done(struct drm_plane *plane)
bool ipu_plane_atomic_update_pending
> +{
> + struct ipu_plane *ipu_plane = to_ipu_plane(plane);
> + struct drm_plane_state *state = plane->state;
> + struct ipu_plane_state *ipu_state = to_ipu_plane_state(state);
> +
> + /* disabled crtcs must not block the update */
> + if (!state->crtc)
> + return true;
> +
> + if (ipu_state->use_pre)
> + return ipu_prg_channel_configure_done(ipu_plane->ipu_ch);
This hides the -EINVAL return value being interpreted as true, better
have this return bool.
regards
Philipp
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
