Merge tag 'tilcdc-4.10-fixes' of https://github.com/jsarha/linux into drm-fixes

tilcdc fixes for v4.10.

* tag 'tilcdc-4.10-fixes' of https://github.com/jsarha/linux:
  drm: tilcdc: simplify the recovery from sync lost error on rev1

1 files changed, 18 insertions, 9 deletions

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 725dffad5640..6dfdb145f3bb 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -856,7 +856,7 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
         struct tilcdc_crtc *tilcdc_crtc = to_tilcdc_crtc(crtc);
         struct drm_device *dev = crtc->dev;
         struct tilcdc_drm_private *priv = dev->dev_private;
-        uint32_t stat;
+        uint32_t stat, reg;
 
         stat = tilcdc_read_irqstatus(dev);
         tilcdc_clear_irqstatus(dev, stat);
@@ -921,17 +921,26 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
                 dev_err_ratelimited(dev->dev, "%s(0x%08x): Sync lost",
                                     __func__, stat);
                 tilcdc_crtc->frame_intact = false;
-                if (tilcdc_crtc->sync_lost_count++ >
-                    SYNC_LOST_COUNT_LIMIT) {
-                        dev_err(dev->dev, "%s(0x%08x): Sync lost flood detected, recovering", __func__, stat);
-                        queue_work(system_wq, &tilcdc_crtc->recover_work);
-                        if (priv->rev == 1)
+                if (priv->rev == 1) {
+                        reg = tilcdc_read(dev, LCDC_RASTER_CTRL_REG);
+                        if (reg & LCDC_RASTER_ENABLE) {
                                 tilcdc_clear(dev, LCDC_RASTER_CTRL_REG,
-                                             LCDC_V1_SYNC_LOST_INT_ENA);
-                        else
+                                             LCDC_RASTER_ENABLE);
+                                tilcdc_set(dev, LCDC_RASTER_CTRL_REG,
+                                           LCDC_RASTER_ENABLE);
+                        }
+                } else {
+                        if (tilcdc_crtc->sync_lost_count++ >
+                            SYNC_LOST_COUNT_LIMIT) {
+                                dev_err(dev->dev,
+                                        "%s(0x%08x): Sync lost flood detected, recovering",
+                                        __func__, stat);
+                                queue_work(system_wq,
+                                           &tilcdc_crtc->recover_work);
                                 tilcdc_write(dev, LCDC_INT_ENABLE_CLR_REG,
                                              LCDC_SYNC_LOST);
-                        tilcdc_crtc->sync_lost_count = 0;
+                                tilcdc_crtc->sync_lost_count = 0;
+                        }
                 }
         }