Commit 13eae1f9 authored by Dima Zavin's avatar Dima Zavin Committed by Tomi Valkeinen

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: default avatarDima Zavin <dima@android.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 0f770b47
...@@ -3306,6 +3306,8 @@ static void dispc_error_worker(struct work_struct *work) ...@@ -3306,6 +3306,8 @@ static void dispc_error_worker(struct work_struct *work)
dispc.error_irqs = 0; dispc.error_irqs = 0;
spin_unlock_irqrestore(&dispc.irq_lock, flags); spin_unlock_irqrestore(&dispc.irq_lock, flags);
dispc_runtime_get();
if (errors & DISPC_IRQ_GFX_FIFO_UNDERFLOW) { if (errors & DISPC_IRQ_GFX_FIFO_UNDERFLOW) {
DSSERR("GFX_FIFO_UNDERFLOW, disabling GFX\n"); DSSERR("GFX_FIFO_UNDERFLOW, disabling GFX\n");
for (i = 0; i < omap_dss_get_num_overlays(); ++i) { for (i = 0; i < omap_dss_get_num_overlays(); ++i) {
...@@ -3492,6 +3494,8 @@ static void dispc_error_worker(struct work_struct *work) ...@@ -3492,6 +3494,8 @@ static void dispc_error_worker(struct work_struct *work)
dispc.irq_error_mask |= errors; dispc.irq_error_mask |= errors;
_omap_dispc_set_irqs(); _omap_dispc_set_irqs();
spin_unlock_irqrestore(&dispc.irq_lock, flags); spin_unlock_irqrestore(&dispc.irq_lock, flags);
dispc_runtime_put();
} }
int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout) int omap_dispc_wait_for_irq_timeout(u32 irqmask, unsigned long timeout)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment