From d4b2bf553a514e78cb2b66c5f6945b7be78c46d0 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 8 Nov 2012 10:05:31 +0200 Subject: [PATCH] --- yaml --- r: 344657 b: refs/heads/master c: 15f5e7324a683ee1c2991a9953103dd9b3b6fa5e h: refs/heads/master i: 344655: 5aade067f66f8196f76c1c62821eba0733357cc2 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dispc.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 91c87708814d..1f190e4502eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cffa947d2769f3249beecb499b7d4083feeeb267 +refs/heads/master: 15f5e7324a683ee1c2991a9953103dd9b3b6fa5e diff --git a/trunk/drivers/video/omap2/dss/dispc.c b/trunk/drivers/video/omap2/dss/dispc.c index 21fa587b121c..bc64d77a8717 100644 --- a/trunk/drivers/video/omap2/dss/dispc.c +++ b/trunk/drivers/video/omap2/dss/dispc.c @@ -2732,7 +2732,6 @@ static void dispc_mgr_enable_digit_out(void) static void dispc_mgr_disable_digit_out(void) { DECLARE_COMPLETION_ONSTACK(framedone_compl); - enum dss_hdmi_venc_clk_source_select src; int r, i; u32 irq_mask; int num_irqs; @@ -2740,18 +2739,20 @@ static void dispc_mgr_disable_digit_out(void) if (dispc_mgr_is_enabled(OMAP_DSS_CHANNEL_DIGIT) == false) return; - src = dss_get_hdmi_venc_clk_source(); - /* * When we disable the digit output, we need to wait for FRAMEDONE to - * know that DISPC has finished with the output. For analog tv out we'll - * use vsync, as omap2/3 don't have framedone for TV. + * know that DISPC has finished with the output. */ - if (src == DSS_HDMI_M_PCLK) { - irq_mask = DISPC_IRQ_FRAMEDONETV; - num_irqs = 1; - } else { + irq_mask = dispc_mgr_get_framedone_irq(OMAP_DSS_CHANNEL_DIGIT); + num_irqs = 1; + + if (!irq_mask) { + /* + * omap 2/3 don't have framedone irq for TV, so we need to use + * vsyncs for this. + */ + irq_mask = dispc_mgr_get_vsync_irq(OMAP_DSS_CHANNEL_DIGIT); /* * We need to wait for both even and odd vsyncs. Note that this