Skip to content

Commit

Permalink
OMAP: DSS2: VENC: make 20ms venc bug-fix sleep optional
Browse files Browse the repository at this point in the history
There's a 20ms sleep after VENC reset. It's unknown what bug this
circumvents and on what platforms. Add a Kconfig option to disable the
sleep.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
  • Loading branch information
Tomi Valkeinen committed May 11, 2011
1 parent f1aafdc commit c6f65e1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
12 changes: 12 additions & 0 deletions drivers/video/omap2/dss/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,16 @@ config OMAP2_DSS_SLEEP_BEFORE_RESET
However, 50ms is quite long time to sleep, and with some
configurations the SYNC_LOST may never happen, so the sleep can
be disabled here.

config OMAP2_DSS_SLEEP_AFTER_VENC_RESET
bool "Sleep 20ms after VENC reset"
default y
help
There is a 20ms sleep after VENC reset which seemed to fix the
reset. The reason for the bug is unclear, and it's also unclear
on what platforms this happens.

This option enables the sleep, and is enabled by default. You can
disable the sleep if it doesn't cause problems on your platform.

endif
3 changes: 3 additions & 0 deletions drivers/video/omap2/dss/venc.c
Original file line number Diff line number Diff line change
Expand Up @@ -373,8 +373,11 @@ static void venc_reset(void)
}
}

#ifdef CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET
/* the magical sleep that makes things work */
/* XXX more info? What bug this circumvents? */
msleep(20);
#endif
}

static void venc_enable_clocks(int enable)
Expand Down

0 comments on commit c6f65e1

Please sign in to comment.