On 05/29/2015 06:42 AM, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx>
>
> exynos needs to update planes with the crtc enabled (mainly for the FIMD
> case) so this specific atomic commit changes the order of
> drm_atomic_helper_commit_modeset_enables() and
> drm_atomic_helper_commit_planes() to commit planes after we enable crtc
> and encoders.
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx>
> ---
> drivers/gpu/drm/exynos/exynos_drm_fb.c | 27 ++++++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
> index 05d229c..b11047c 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
> @@ -16,6 +16,7 @@
> #include <drm/drm_crtc.h>
> #include <drm/drm_crtc_helper.h>
> #include <drm/drm_fb_helper.h>
> +#include <drm/drm_atomic.h>
> #include <drm/drm_atomic_helper.h>
> #include <uapi/drm/exynos_drm.h>
>
> @@ -270,7 +271,31 @@ static int exynos_atomic_commit(struct drm_device *dev,
> struct drm_atomic_state *state,
> bool async)
> {
> - return drm_atomic_helper_commit(dev, state, false);
> + int ret;
> +
> + ret = drm_atomic_helper_prepare_planes(dev, state);
> + if (ret)
> + return ret;
> +
> + /*
> + * This is the point of no return
> + */
Just oneline comment is enough.
> +
> + drm_atomic_helper_swap_state(dev, state);
> +
> + drm_atomic_helper_commit_modeset_disables(dev, state);
> +
> + drm_atomic_helper_commit_modeset_enables(dev, state);
Maybe need description as comments about why need to change operation
order.
> +
> + drm_atomic_helper_commit_planes(dev, state);
> +
> + drm_atomic_helper_wait_for_vblanks(dev, state);
> +
> + drm_atomic_helper_cleanup_planes(dev, state);
> +
> + drm_atomic_state_free(state);
> +
> + return 0;
> }
>
> static const struct drm_mode_config_funcs exynos_drm_mode_config_funcs = {
>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
