video: tegra: dc: Fix and refactor FRAME_END_INT

- Fix a conflict with other DC interrupt masks
  when the DSI driver waits on FRAME_END_INT
- Move generic FRAME_END_INT mask/unmask and
  wait-for functions to dc.c

Bug 1534724

Change-Id: I40e26ada2f0494782979e32c1a22906361b214b5
Signed-off-by: Daniel Solomon <daniels@nvidia.com>
Reviewed-on: http://git-master/r/451186
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Jon Mayo <jmayo@nvidia.com>

1 files changed, 2 insertions, 17 deletions

diff --git a/drivers/video/tegra/dc/dsi.c b/drivers/video/tegra/dc/dsi.c
index 4967d08d8..8fd4539b0 100644
--- a/drivers/video/tegra/dc/dsi.c
+++ b/drivers/video/tegra/dc/dsi.c
@@ -1728,7 +1728,6 @@ static int tegra_dsi_wait_frame_end(struct tegra_dc *dc,
                                 struct tegra_dc_dsi_data *dsi,
                                 u32 timeout_n_frames)
 {
-        int val;
         long timeout;
         u32 frame_period = DIV_ROUND_UP(S_TO_MS(1), dsi->info.refresh_rate);
         struct tegra_dc_mode mode = dc->mode;
@@ -1741,26 +1740,12 @@ static int tegra_dsi_wait_frame_end(struct tegra_dc *dc,
                 dev_WARN(&dc->ndev->dev,
                 "dsi: to stop at next frame give at least 2 frame delay\n");
 
-        reinit_completion(&dc->frame_end_complete);
-
-        tegra_dc_get(dc);
-
-        tegra_dc_flush_interrupt(dc, FRAME_END_INT);
-        /* unmask frame end interrupt */
-        val = tegra_dc_unmask_interrupt(dc, FRAME_END_INT);
-
-        timeout = wait_for_completion_interruptible_timeout(
-                        &dc->frame_end_complete,
-                        msecs_to_jiffies(timeout_n_frames * frame_period));
-
-        /* reinstate interrupt mask */
-        tegra_dc_writel(dc, val, DC_CMD_INT_MASK);
+        timeout = tegra_dc_wait_for_frame_end(dc, timeout_n_frames *
+                frame_period);
 
         /* wait for v_ref_to_sync no. of lines after frame end interrupt */
         udelay(mode.v_ref_to_sync * line_period);
 
-        tegra_dc_put(dc);
-
         return timeout;
 }