drm/sun4i: backend: Make sure we don't have a commit pending

If we try to read the backend registers while it fetches the new values, we
end up with the value of some random register instead of the one we asked
for.

In order to prevent that, let's make sure that the very first thing we do
during our atomic modesetting is to let the commit bit come to a rest.

We don't have to worry about anything else since the only time we will
trigger a new transaction is during the atomic_commit which comes much
later.

Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/35604307e5bde2b85c674de79fa7c4d55700f085.1516613040.git-series.maxime.ripard@free-electrons.com

diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
index 66ce8bfd72ab8cde743ce1cdf0bb5cbeb80f026c..caecae4ca7c49a58a0904d607d338a65172042e0 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_backend.c
+++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
@@ -296,6 +296,17 @@ static bool sun4i_backend_plane_uses_frontend(struct drm_plane_state *state)
        return sun4i_backend_plane_uses_scaler(state);
 }
 
+static void sun4i_backend_atomic_begin(struct sunxi_engine *engine,
+                                      struct drm_crtc_state *old_state)
+{
+       u32 val;
+
+       WARN_ON(regmap_read_poll_timeout(engine->regs,
+                                        SUN4I_BACKEND_REGBUFFCTL_REG,
+                                        val, !(val & SUN4I_BACKEND_REGBUFFCTL_LOADCTL),
+                                        100, 50000));
+}
+
 static int sun4i_backend_atomic_check(struct sunxi_engine *engine,
                                      struct drm_crtc_state *crtc_state)
 {
@@ -478,6 +489,7 @@ static struct sun4i_frontend *sun4i_backend_find_frontend(struct sun4i_drv *drv,
 }
 
 static const struct sunxi_engine_ops sun4i_backend_engine_ops = {
+       .atomic_begin                   = sun4i_backend_atomic_begin,
        .atomic_check                   = sun4i_backend_atomic_check,
        .commit                         = sun4i_backend_commit,
        .layers_init                    = sun4i_layers_init,