Acked-by: Vincent Abriou <vincent.abr...@st.com>
On 01/12/2017 05:27 PM, Fabien Dessenne wrote:
> Since nonblocking atomic commits are now supported, the driver can
> now use drm_atomic_helper_commit().
>
> Signed-off-by: Fabien Dessenne <fabien.desse...@st.com>
> ---
> drivers/gpu/drm/sti/sti_drv.c | 83
> +------------------------------------------
> drivers/gpu/drm/sti/sti_drv.h | 6 ----
> 2 files changed, 1 insertion(+), 88 deletions(-)
>
> diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c
> index ff71e25..9a9b9a2 100644
> --- a/drivers/gpu/drm/sti/sti_drv.c
> +++ b/drivers/gpu/drm/sti/sti_drv.c
> @@ -150,52 +150,6 @@ static void sti_drm_dbg_cleanup(struct drm_minor *minor)
> 1, minor);
> }
>
> -static void sti_atomic_schedule(struct sti_private *private,
> - struct drm_atomic_state *state)
> -{
> - private->commit.state = state;
> - schedule_work(&private->commit.work);
> -}
> -
> -static void sti_atomic_complete(struct sti_private *private,
> - struct drm_atomic_state *state)
> -{
> - struct drm_device *drm = private->drm_dev;
> -
> - /*
> - * Everything below can be run asynchronously without the need to grab
> - * any modeset locks at all under one condition: It must be guaranteed
> - * that the asynchronous work has either been cancelled (if the driver
> - * supports it, which at least requires that the framebuffers get
> - * cleaned up with drm_atomic_helper_cleanup_planes()) or completed
> - * before the new state gets committed on the software side with
> - * drm_atomic_helper_swap_state().
> - *
> - * This scheme allows new atomic state updates to be prepared and
> - * checked in parallel to the asynchronous completion of the previous
> - * update. Which is important since compositors need to figure out the
> - * composition of the next frame right after having submitted the
> - * current layout.
> - */
> -
> - drm_atomic_helper_commit_modeset_disables(drm, state);
> - drm_atomic_helper_commit_planes(drm, state, 0);
> - drm_atomic_helper_commit_modeset_enables(drm, state);
> -
> - drm_atomic_helper_wait_for_vblanks(drm, state);
> -
> - drm_atomic_helper_cleanup_planes(drm, state);
> - drm_atomic_state_put(state);
> -}
> -
> -static void sti_atomic_work(struct work_struct *work)
> -{
> - struct sti_private *private = container_of(work,
> - struct sti_private, commit.work);
> -
> - sti_atomic_complete(private, private->commit.state);
> -}
> -
> static int sti_atomic_check(struct drm_device *dev,
> struct drm_atomic_state *state)
> {
> @@ -216,38 +170,6 @@ static int sti_atomic_check(struct drm_device *dev,
> return ret;
> }
>
> -static int sti_atomic_commit(struct drm_device *drm,
> - struct drm_atomic_state *state, bool nonblock)
> -{
> - struct sti_private *private = drm->dev_private;
> - int err;
> -
> - err = drm_atomic_helper_prepare_planes(drm, state);
> - if (err)
> - return err;
> -
> - /* serialize outstanding nonblocking commits */
> - mutex_lock(&private->commit.lock);
> - flush_work(&private->commit.work);
> -
> - /*
> - * This is the point of no return - everything below never fails except
> - * when the hw goes bonghits. Which means we can commit the new state on
> - * the software side now.
> - */
> -
> - drm_atomic_helper_swap_state(state, true);
> -
> - drm_atomic_state_get(state);
> - if (nonblock)
> - sti_atomic_schedule(private, state);
> - else
> - sti_atomic_complete(private, state);
> -
> - mutex_unlock(&private->commit.lock);
> - return 0;
> -}
> -
> static void sti_output_poll_changed(struct drm_device *ddev)
> {
> struct sti_private *private = ddev->dev_private;
> @@ -271,7 +193,7 @@ static const struct drm_mode_config_funcs
> sti_mode_config_funcs = {
> .fb_create = drm_fb_cma_create,
> .output_poll_changed = sti_output_poll_changed,
> .atomic_check = sti_atomic_check,
> - .atomic_commit = sti_atomic_commit,
> + .atomic_commit = drm_atomic_helper_commit,
> };
>
> static void sti_mode_config_init(struct drm_device *dev)
> @@ -352,9 +274,6 @@ static int sti_init(struct drm_device *ddev)
> dev_set_drvdata(ddev->dev, ddev);
> private->drm_dev = ddev;
>
> - mutex_init(&private->commit.lock);
> - INIT_WORK(&private->commit.work, sti_atomic_work);
> -
> drm_mode_config_init(ddev);
>
> sti_mode_config_init(ddev);
> diff --git a/drivers/gpu/drm/sti/sti_drv.h b/drivers/gpu/drm/sti/sti_drv.h
> index 78ebe5e..f9276cd 100644
> --- a/drivers/gpu/drm/sti/sti_drv.h
> +++ b/drivers/gpu/drm/sti/sti_drv.h
> @@ -25,12 +25,6 @@ struct sti_private {
> struct drm_property *plane_zorder_property;
> struct drm_device *drm_dev;
> struct drm_fbdev_cma *fbdev;
> -
> - struct {
> - struct drm_atomic_state *state;
> - struct work_struct work;
> - struct mutex lock;
> - } commit;
> };
>
> extern struct platform_driver sti_tvout_driver;
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
