OMAP: DSS: dispc: enable/disable clocks in error handler

There's no guarantee that the error handler worker thread
will run while the dispc clocks are on. Explicitly enable/disable
them.

Signed-off-by: Dima Zavin <dima@android.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>

diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 0f3961a..1caea42 100644 (file)
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -3306,6 +3306,8 @@ static void dispc_error_worker(struct work_struct *work)
        dispc.error_irqs = 0;
        spin_unlock_irqrestore(&dispc.irq_lock, flags);
 
+       dispc_runtime_get();
+
        if (errors & DISPC_IRQ_GFX_FIFO_UNDERFLOW) {
                DSSERR("GFX_FIFO_UNDERFLOW, disabling GFX\n");
                for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
@@ -3492,6 +3494,8 @@ static void dispc_error_worker(struct work_struct *work)
        dispc.irq_error_mask |= errors;
        _omap_dispc_set_irqs();
        spin_unlock_irqrestore(&dispc.irq_lock, flags);
+
+       dispc_runtime_put();
 }
 
 int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout)