diff options
| author | Xavier Boudet <x-boudet@ti.com> | 2012-01-06 17:29:06 +0100 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2012-01-09 14:14:04 +0100 |
| commit | 02fed2e7d1c92a05ad407cfdb2b6c33e6d76454b (patch) | |
| tree | d88ede09225fecfee1af951c45b2cd56eb203d7d | |
| parent | 17cf2a338dab866f59837ec8a7701878c7d38ca3 (diff) | |
omap dss make gfx fifo underflow nonfatal
Signed-off-by: Xavier Boudet <x-boudet@ti.com>
| -rw-r--r-- | drivers/video/omap2/dss/dispc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 02ecc30d8b2a..ab36f80cefc0 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c @@ -3273,7 +3273,8 @@ static void dispc_error_worker(struct work_struct *work) spin_unlock_irqrestore(&dispc.irq_lock, flags); if (errors & DISPC_IRQ_GFX_FIFO_UNDERFLOW) { - DSSERR("GFX_FIFO_UNDERFLOW, disabling GFX\n"); + DSSERR("GFX_FIFO_UNDERFLOW, BUT NOT disabling GFX\n"); +#if 0 for (i = 0; i < omap_dss_get_num_overlays(); ++i) { struct omap_overlay *ovl; ovl = omap_dss_get_overlay(i); @@ -3288,6 +3289,7 @@ static void dispc_error_worker(struct work_struct *work) break; } } +#endif } if (errors & DISPC_IRQ_VID1_FIFO_UNDERFLOW) { @@ -3369,8 +3371,8 @@ static void dispc_error_worker(struct work_struct *work) struct omap_overlay_manager *manager = NULL; bool enable = false; - DSSERR("SYNC_LOST_DIGIT, disabling TV\n"); - + DSSERR("SYNC_LOST_DIGIT, BUT NOT disabling TV\n"); +#if 0 for (i = 0; i < omap_dss_get_num_overlay_managers(); ++i) { struct omap_overlay_manager *mgr; mgr = omap_dss_get_overlay_manager(i); @@ -3402,6 +3404,7 @@ static void dispc_error_worker(struct work_struct *work) if (enable) dssdev->driver->enable(dssdev); } +#endif } if (errors & DISPC_IRQ_SYNC_LOST2) { |