drm/omapdrm: Move commit_modeset_enables() before commit_planes()

Move drm_atomic_helper_commit_modeset_enables() call to before
drm_atomic_helper_commit_planes() call and have a
omap_atomic_wait_for_completion() call after both.

With the current dss dispc implementation we have to enable the new
modeset before we can commit planes. The dispc ovl configuration
relies on the video mode configuration been written into the HW when
the ovl configuration is calculated.

This approach is not ideal because after a mode change the plane
update is executed only after the first vblank interrupt. The dispc
implementation should be fixed so that it is able use uncommitted drm
state information.  information.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
index f85c9c8d8467ff35166dc1e7585b1f2377769764..3f2554235225b5b5a37960d4e8511be1ff057e09 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@ -96,8 +96,22 @@ static void omap_atomic_complete(struct omap_atomic_state_commit *commit)
        dispc_runtime_get();
 
        drm_atomic_helper_commit_modeset_disables(dev, old_state);
-       drm_atomic_helper_commit_planes(dev, old_state, 0);
+
+       /* With the current dss dispc implementation we have to enable
+        * the new modeset before we can commit planes. The dispc ovl
+        * configuration relies on the video mode configuration been
+        * written into the HW when the ovl configuration is
+        * calculated.
+        *
+        * This approach is not ideal because after a mode change the
+        * plane update is executed only after the first vblank
+        * interrupt. The dispc implementation should be fixed so that
+        * it is able use uncommitted drm state information.
+        */
        drm_atomic_helper_commit_modeset_enables(dev, old_state);
+       omap_atomic_wait_for_completion(dev, old_state);
+
+       drm_atomic_helper_commit_planes(dev, old_state, 0);
 
        omap_atomic_wait_for_completion(dev, old_state);