From e4e2e776a3d4bf1adf37fc061cfdfb92281f3ace Mon Sep 17 00:00:00 2001 From: Raghavendra VK Date: Fri, 3 Aug 2012 21:25:43 -0700 Subject: video: tegra: dc: Add timestamp support bug 1021221 Change-Id: Ifbe007de5bdeafaa15a0b3f2a138086045eba160 Signed-off-by: Raghavendra VK Reviewed-on: http://git-master/r/118179 (cherry picked from commit 74be8d4e7210d7bcea0d55565a7cbb06d6cc960e) Reviewed-on: http://git-master/r/121087 Reviewed-by: Jon Mayo Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Robert Morell --- drivers/video/tegra/dc/dc.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'drivers/video/tegra/dc/dc.c') diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index db97ed3d3c13..de865e4e2da3 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -1045,6 +1045,10 @@ static void tegra_dc_continuous_irq(struct tegra_dc *dc, unsigned long status) queue_work(system_freezable_wq, &dc->vblank_work); if (status & FRAME_END_INT) { + struct timespec tm = CURRENT_TIME; + dc->frame_end_timestamp = timespec_to_ns(&tm); + wake_up(&dc->timestamp_wq); + /* Mark the frame_end as complete. */ if (!completion_done(&dc->frame_end_complete)) complete(&dc->frame_end_complete); @@ -1052,6 +1056,20 @@ static void tegra_dc_continuous_irq(struct tegra_dc *dc, unsigned long status) tegra_dc_trigger_windows(dc); } } + +/* XXX: Not sure if we limit look ahead to 1 frame */ +bool tegra_dc_is_within_n_vsync(struct tegra_dc *dc, s64 ts) +{ + return ((ts - dc->frame_end_timestamp) < dc->frametime_ns); +} + +bool tegra_dc_does_vsync_separate(struct tegra_dc *dc, s64 new_ts, s64 old_ts) +{ + return (((new_ts - old_ts) > dc->frametime_ns) + || (div_s64((new_ts - dc->frame_end_timestamp), dc->frametime_ns) + != div_s64((old_ts - dc->frame_end_timestamp), + dc->frametime_ns))); +} #endif static irqreturn_t tegra_dc_irq(int irq, void *ptr) @@ -1759,6 +1777,7 @@ static int tegra_dc_probe(struct nvhost_device *ndev, mutex_init(&dc->one_shot_lock); init_completion(&dc->frame_end_complete); init_waitqueue_head(&dc->wq); + init_waitqueue_head(&dc->timestamp_wq); #ifdef CONFIG_ARCH_TEGRA_2x_SOC INIT_WORK(&dc->reset_work, tegra_dc_reset_worker); #endif -- cgit v1.2.3