1 files changed, 13 insertions, 8 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c
index e91687fe41be..c5c21776131a 100644
--- a/drivers/gpu/drm/omapdrm/omap_crtc.c
+++ b/drivers/gpu/drm/omapdrm/omap_crtc.c
@@ -72,6 +72,8 @@ struct omap_crtc {
          * XXX maybe fold into apply_work??
          */
         struct work_struct page_flip_work;
+
+        bool ignore_digit_sync_lost;
 };
 
 /* -----------------------------------------------------------------------------
@@ -157,7 +159,7 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
          * Digit output produces some sync lost interrupts during the first
          * frame when enabling, so we need to ignore those.
          */
-        omap_irq_unregister(crtc->dev, &omap_crtc->error_irq);
+        omap_crtc->ignore_digit_sync_lost = true;
 
         framedone_irq = dispc_mgr_get_framedone_irq(channel);
         vsync_irq = dispc_mgr_get_vsync_irq(channel);
@@ -188,7 +190,9 @@ static void omap_crtc_set_enabled(struct drm_crtc *crtc, bool enable)
                                 omap_crtc->name, enable ? "enable" : "disable");
         }
 
-        omap_irq_register(crtc->dev, &omap_crtc->error_irq);
+        omap_crtc->ignore_digit_sync_lost = false;
+        /* make sure the irq handler sees the value above */
+        mb();
 }
 
 
@@ -260,10 +264,14 @@ static void omap_crtc_error_irq(struct omap_drm_irq *irq, uint32_t irqstatus)
 {
         struct omap_crtc *omap_crtc =
                         container_of(irq, struct omap_crtc, error_irq);
-        struct drm_crtc *crtc = &omap_crtc->base;
+
+        if (omap_crtc->ignore_digit_sync_lost) {
+                irqstatus &= ~DISPC_IRQ_SYNC_LOST_DIGIT;
+                if (!irqstatus)
+                        return;
+        }
+
         DRM_ERROR_RATELIMITED("%s: errors: %08x\n", omap_crtc->name, irqstatus);
-        /* avoid getting in a flood, unregister the irq until next vblank */
-        __omap_irq_unregister(crtc->dev, &omap_crtc->error_irq);
 }
 
 static void omap_crtc_apply_irq(struct omap_drm_irq *irq, uint32_t irqstatus)
@@ -272,9 +280,6 @@ static void omap_crtc_apply_irq(struct omap_drm_irq *irq, uint32_t irqstatus)
                         container_of(irq, struct omap_crtc, apply_irq);
         struct drm_crtc *crtc = &omap_crtc->base;
 
-        if (!omap_crtc->error_irq.registered)
-                __omap_irq_register(crtc->dev, &omap_crtc->error_irq);
-
         if (!dispc_mgr_go_busy(omap_crtc->channel)) {
                 struct omap_drm_private *priv =
                                 crtc->dev->dev_private;