diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-11-18 08:39:52 -0500 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-12-02 01:54:45 -0500 |
commit | 7d1365c998a462d8ea3627e87526227556b63351 (patch) | |
tree | 2e4f3e965d626b47c88a1774b447cf1522134687 | |
parent | 75c949653fdf77a17753ffb8462a3c458c476271 (diff) |
OMAPDSS: DISPC: add dispc_mgr_get_framedone_irq
Add dispc_mgr_get_framedone_irq() which returns the irq number for
FRAMEDONE for the given channel.
Note that the function returns always 0 for DIGIT channel, even if OMAP4
does have FRAMEDONE_TV interrupt. The reason for this is that this
function is currently used only to track manual updates, and thus
FRAMEDONE_TV is not needed.
If there's need in the future to also get the FRAMEDONE_TV this needs
revisiting. However, as FRAMEDONE_TV doesn't exist on OMAP2/3, the use
of this function for that purpose needs some extra code to handle the
OMAP2/3 case.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 14 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dss.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 5f09120d4537..0f84034928ad 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c | |||
@@ -452,6 +452,20 @@ u32 dispc_mgr_get_vsync_irq(enum omap_channel channel) | |||
452 | } | 452 | } |
453 | } | 453 | } |
454 | 454 | ||
455 | u32 dispc_mgr_get_framedone_irq(enum omap_channel channel) | ||
456 | { | ||
457 | switch (channel) { | ||
458 | case OMAP_DSS_CHANNEL_LCD: | ||
459 | return DISPC_IRQ_FRAMEDONE; | ||
460 | case OMAP_DSS_CHANNEL_LCD2: | ||
461 | return DISPC_IRQ_FRAMEDONE2; | ||
462 | case OMAP_DSS_CHANNEL_DIGIT: | ||
463 | return 0; | ||
464 | default: | ||
465 | BUG(); | ||
466 | } | ||
467 | } | ||
468 | |||
455 | bool dispc_mgr_go_busy(enum omap_channel channel) | 469 | bool dispc_mgr_go_busy(enum omap_channel channel) |
456 | { | 470 | { |
457 | int bit; | 471 | int bit; |
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h index 7aac8a3367bc..6fce3108c060 100644 --- a/drivers/video/omap2/dss/dss.h +++ b/drivers/video/omap2/dss/dss.h | |||
@@ -430,6 +430,7 @@ void dispc_ovl_set_channel_out(enum omap_plane plane, | |||
430 | void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable); | 430 | void dispc_mgr_enable_fifohandcheck(enum omap_channel channel, bool enable); |
431 | void dispc_mgr_set_lcd_size(enum omap_channel channel, u16 width, u16 height); | 431 | void dispc_mgr_set_lcd_size(enum omap_channel channel, u16 width, u16 height); |
432 | u32 dispc_mgr_get_vsync_irq(enum omap_channel channel); | 432 | u32 dispc_mgr_get_vsync_irq(enum omap_channel channel); |
433 | u32 dispc_mgr_get_framedone_irq(enum omap_channel channel); | ||
433 | bool dispc_mgr_go_busy(enum omap_channel channel); | 434 | bool dispc_mgr_go_busy(enum omap_channel channel); |
434 | void dispc_mgr_go(enum omap_channel channel); | 435 | void dispc_mgr_go(enum omap_channel channel); |
435 | bool dispc_mgr_is_enabled(enum omap_channel channel); | 436 | bool dispc_mgr_is_enabled(enum omap_channel channel); |