drm: omapdrm: Fix race condition between GO and vblank IRQ

The vblank interrupt is used by the driver as a completion signal when
applying new settings.

A race condition exist between enabling the vblank interrupt and
applying new settings to the hardware by setting the GO bit. If a vblank
interrupt occurs in-between, the driver will incorrectly consider the
new settings to be applied. Fix this by enabling the interrupt after
setting the GO bit.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index c7d3e1eec6cb11235735a4fe12fbf81790d8c318..3f811186c8914c9225c89e52820c40774bd7ec5a 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -501,8 +501,8 @@ static void apply_worker(struct work_struct *work)
                DBG("%s: GO", omap_crtc->name);
 
                if (dispc_mgr_is_enabled(channel)) {
-                       omap_irq_register(dev, &omap_crtc->apply_irq);
                        dispc_mgr_go(channel);
+                       omap_irq_register(dev, &omap_crtc->apply_irq);
                } else {
                        struct omap_drm_private *priv = dev->dev_private;
                        queue_work(priv->wq, &omap_crtc->apply_work);