drm/tilcdc: Add timeout wait for palette loading to complete
authorJyri Sarha <jsarha@ti.com>
Thu, 17 Nov 2016 16:46:16 +0000 (18:46 +0200)
committerJyri Sarha <jsarha@ti.com>
Wed, 30 Nov 2016 12:19:34 +0000 (14:19 +0200)
Add timeout wait for palette loadind to complete. We do not want to
hang forever if palette loaded interrupt does not arrive for some
reason.

Signed-off-by: Jyri Sarha <jsarha@ti.com>
Tested-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
drivers/gpu/drm/tilcdc/tilcdc_crtc.c

index b3edc6d..f736a89 100644 (file)
@@ -125,6 +125,7 @@ static void tilcdc_crtc_load_palette(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;
+       int ret;
 
        dma_fb_base = tilcdc_read(dev, LCDC_DMA_FB_BASE_ADDR_0_REG);
        dma_fb_ceiling = tilcdc_read(dev, LCDC_DMA_FB_CEILING_ADDR_0_REG);
@@ -152,7 +153,10 @@ static void tilcdc_crtc_load_palette(struct drm_crtc *crtc)
        tilcdc_clear_irqstatus(dev, 0xffffffff);
        tilcdc_set(dev, LCDC_RASTER_CTRL_REG, LCDC_RASTER_ENABLE);
 
-       wait_for_completion(&tilcdc_crtc->palette_loaded);
+       ret = wait_for_completion_timeout(&tilcdc_crtc->palette_loaded,
+                                         msecs_to_jiffies(50));
+       if (ret == 0)
+               dev_err(dev->dev, "%s: Palette loading timeout", __func__);
 
        /* Disable LCDC DMA and DMA Palette Loaded Interrupt. */
        tilcdc_clear(dev, LCDC_RASTER_CTRL_REG, LCDC_RASTER_ENABLE);