diff options
| author | Mythri P K <mythripk@ti.com> | 2010-08-02 12:06:09 +0530 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-09-14 19:26:44 -0500 |
| commit | 2eb97178e25522c48d8cbbabe2a47528689151ba (patch) | |
| tree | edeb16951c9cda59032475bec6ddf83d36ae11d0 /drivers/media | |
| parent | a4db8bb6398086befc545d4d43147d847c72cf6d (diff) | |
V4L2: picoDLP changes for omap_vout_isr
Signed-off-by: Mythri P K <mythripk@ti.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/omap/omap_vout.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index a0f0c76938be..7bea342ade57 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -1079,8 +1079,13 @@ void omap_vout_isr(void *arg, unsigned int irqstatus) case OMAP_DISPLAY_TYPE_DPI: if (!(irqstatus & (DISPC_IRQ_VSYNC | DISPC_IRQ_VSYNC2))) goto vout_isr_err; +#ifdef CONFIG_PANEL_PICO_DLP + if (dispc_go_busy(OMAP_DSS_CHANNEL_LCD2)) { + printk(KERN_INFO "dpi busy %d\n", cur_display->type); + goto vout_isr_err; + } +#endif break; - #if CONFIG_OMAP2_DSS_HDMI case OMAP_DISPLAY_TYPE_HDMI: if (!(irqstatus & DISPC_IRQ_EVSYNC_EVEN)) @@ -1162,7 +1167,10 @@ venc: if (ret) printk(KERN_ERR VOUT_NAME "failed to change mode\n"); - +#ifdef CONFIG_PANEL_PICO_DLP + if (sysfs_streq(cur_display->name, "pico_DLP")) + dispc_go(OMAP_DSS_CHANNEL_LCD2); +#endif vout_isr_err: spin_unlock_irqrestore(&vout->vbq_lock, flags); } |