OSDN Git Service

drm/tilcdc: remove broken error handling
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 20 Oct 2015 09:04:05 +0000 (12:04 +0300)
committerJyri Sarha <jsarha@ti.com>
Thu, 25 Feb 2016 14:39:39 +0000 (16:39 +0200)
Remove broken error handling. The condition for handling the
LCDC_SYNC_LOST and LCDC_FIFO_UNDERFLOW could never be satisfied as the
LCDC_SYNC_LOST interrupt is not enabled. Also the requirement to have
both LCDC_SYNC_LOST and LCDC_FIFO_UNDERFLOW fired at once before
handling the error looks weird.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
[Added description to the patch]
Signed-off-by: Jyri Sarha <jsarha@ti.com>
drivers/gpu/drm/tilcdc/tilcdc_crtc.c

index e62a950..61aead2 100644 (file)
@@ -658,12 +658,7 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
        struct tilcdc_drm_private *priv = dev->dev_private;
        uint32_t stat = tilcdc_read_irqstatus(dev);
 
-       if ((stat & LCDC_SYNC_LOST) && (stat & LCDC_FIFO_UNDERFLOW)) {
-               stop(crtc);
-               dev_err(dev->dev, "error: %08x\n", stat);
-               tilcdc_clear_irqstatus(dev, stat);
-               start(crtc);
-       } else if (stat & LCDC_PL_LOAD_DONE) {
+       if (stat & LCDC_PL_LOAD_DONE) {
                tilcdc_clear_irqstatus(dev, stat);
        } else {
                struct drm_pending_vblank_event *event;