aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/omap2/dss/dispc.c14
-rw-r--r--drivers/video/omap2/dss/dss.h2
2 files changed, 15 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index 1264c2d1512b..5f09120d4537 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -438,6 +438,20 @@ static struct omap_dss_device *dispc_mgr_get_device(enum omap_channel channel)
438 return mgr ? mgr->device : NULL; 438 return mgr ? mgr->device : NULL;
439} 439}
440 440
441u32 dispc_mgr_get_vsync_irq(enum omap_channel channel)
442{
443 switch (channel) {
444 case OMAP_DSS_CHANNEL_LCD:
445 return DISPC_IRQ_VSYNC;
446 case OMAP_DSS_CHANNEL_LCD2:
447 return DISPC_IRQ_VSYNC2;
448 case OMAP_DSS_CHANNEL_DIGIT:
449 return DISPC_IRQ_EVSYNC_ODD | DISPC_IRQ_EVSYNC_EVEN;
450 default:
451 BUG();
452 }
453}
454
441bool dispc_mgr_go_busy(enum omap_channel channel) 455bool dispc_mgr_go_busy(enum omap_channel channel)
442{ 456{
443 int bit; 457 int bit;
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h
index 03c724475bcc..1535496677ba 100644
--- a/drivers/video/omap2/dss/dss.h
+++ b/drivers/video/omap2/dss/dss.h
@@ -409,9 +409,9 @@ int dispc_ovl_enable(enum omap_plane plane, bool enable);
409void dispc_ovl_set_channel_out(enum omap_plane plane, 409void dispc_ovl_set_channel_out(enum omap_plane plane,
410 enum omap_channel channel); 410 enum omap_channel channel);
411 411
412
413void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable); 412void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable);
414void dispc_mgr_set_lcd_size(enum omap_channel channel, u16 width, u16 height); 413void dispc_mgr_set_lcd_size(enum omap_channel channel, u16 width, u16 height);
414u32 dispc_mgr_get_vsync_irq(enum omap_channel channel);
415bool dispc_mgr_go_busy(enum omap_channel channel); 415bool dispc_mgr_go_busy(enum omap_channel channel);
416void dispc_mgr_go(enum omap_channel channel); 416void dispc_mgr_go(enum omap_channel channel);
417bool dispc_mgr_is_enabled(enum omap_channel channel); 417bool dispc_mgr_is_enabled(enum omap_channel channel);