MLK-15110-21 gpu: imx: dpu: framegen: Add timestamp support for frame index

This patch adds framegen timestamp support for the frame index feature.

Signed-off-by: Liu Ying <victor.liu@nxp.com>

diff --git a/drivers/gpu/imx/dpu/dpu-framegen.c b/drivers/gpu/imx/dpu/dpu-framegen.c
index 2e72398..ffbea66 100644 (file)
--- a/drivers/gpu/imx/dpu/dpu-framegen.c
+++ b/drivers/gpu/imx/dpu/dpu-framegen.c
@@ -365,6 +365,52 @@ void framegen_wait_done(struct dpu_framegen *fg)
 }
 EXPORT_SYMBOL_GPL(framegen_wait_done);
 
+static inline u32 framegen_frame_index(u32 stamp)
+{
+       return (stamp & FRAMEINDEX_MASK) >> FRAMEINDEX_SHIFT;
+}
+
+static inline u32 framegen_line_index(u32 stamp)
+{
+       return (stamp & LINEINDEX_MASK) >> LINEINDEX_SHIFT;
+}
+
+void framegen_read_timestamp(struct dpu_framegen *fg,
+                            u32 *frame_index, u32 *line_index)
+{
+       u32 stamp;
+
+       mutex_lock(&fg->mutex);
+       stamp = dpu_fg_read(fg, FGTIMESTAMP);
+       *frame_index = framegen_frame_index(stamp);
+       *line_index = framegen_line_index(stamp);
+       mutex_unlock(&fg->mutex);
+}
+EXPORT_SYMBOL_GPL(framegen_read_timestamp);
+
+void framegen_wait_for_frame_counter_moving(struct dpu_framegen *fg)
+{
+       u32 frame_index, line_index, last_frame_index;
+       unsigned long timeout = jiffies + msecs_to_jiffies(30);
+
+       framegen_read_timestamp(fg, &frame_index, &line_index);
+       do {
+               last_frame_index = frame_index;
+               framegen_read_timestamp(fg, &frame_index, &line_index);
+       } while (last_frame_index == frame_index &&
+                                               time_before(jiffies, timeout));
+
+       if (last_frame_index == frame_index)
+               dev_err(fg->dpu->dev,
+                       "failed to wait for FrameGen%d frame counter moving\n",
+                       fg->id);
+       else
+               dev_dbg(fg->dpu->dev,
+                       "FrameGen%d frame counter moves - last %u, curr %d\n",
+                       fg->id, last_frame_index, frame_index);
+}
+EXPORT_SYMBOL_GPL(framegen_wait_for_frame_counter_moving);
+
 void framegen_enable_clock(struct dpu_framegen *fg)
 {
        clk_prepare_enable(fg->clk_pll);

diff --git a/include/video/dpu.h b/include/video/dpu.h
index 3838247..6694379 100644 (file)
--- a/include/video/dpu.h
+++ b/include/video/dpu.h
@@ -603,6 +603,9 @@ void framegen_sacfg(struct dpu_framegen *fg, unsigned int x, unsigned int y);
 void framegen_displaymode(struct dpu_framegen *fg, fgdm_t mode);
 void framegen_panic_displaymode(struct dpu_framegen *fg, fgdm_t mode);
 void framegen_wait_done(struct dpu_framegen *fg);
+void framegen_read_timestamp(struct dpu_framegen *fg,
+                            u32 *frame_index, u32 *line_index);
+void framegen_wait_for_frame_counter_moving(struct dpu_framegen *fg);
 void framegen_enable_clock(struct dpu_framegen *fg);
 void framegen_disable_clock(struct dpu_framegen *fg);
 struct dpu_framegen *dpu_fg_get(struct dpu_soc *dpu, int id);