Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cores/video: Simplify VTG/DMA synchronization and re-synchronize on each end of frame.

This commit is contained in:
Florent Kermarrec 2023-10-27 18:07:22 +02:00
parent 5842ad7d14
commit b5a9106f56
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
litex/soc/cores/video.py
View File

@ -693,20 +693,14 @@ class VideoFrameBuffer(LiteXModule):
video_pipe_source = self.cdc.source video_pipe_source = self.cdc.source
# Video Synchronization/Generation. # Video Synchronization/Generation.
fsm = FSM(reset_state="VTG-SYNC") fsm = FSM(reset_state="SYNC")
fsm = ClockDomainsRenamer(clock_domain)(fsm) fsm = ClockDomainsRenamer(clock_domain)(fsm)
fsm = ResetInserter()(fsm) fsm = ResetInserter()(fsm)
self.submodules += fsm self.submodules += fsm
self.specials += MultiReg(self.dma.fsm.reset, fsm.reset, clock_domain) self.specials += MultiReg(self.dma.fsm.reset, fsm.reset, clock_domain)
fsm.act("VTG-SYNC", fsm.act("SYNC",
vtg_sink.ready.eq(1), vtg_sink.ready.eq(~fsm.reset),
If(vtg_sink.valid & vtg_sink.last, If(vtg_sink.valid & vtg_sink.last,
NextState("DMA-SYNC")
)
)
fsm.act("DMA-SYNC",
video_pipe_source.ready.eq(1),
If(video_pipe_source.valid & video_pipe_source.last,
NextState("RUN") NextState("RUN")
) )
) )
@ -715,10 +709,13 @@ class VideoFrameBuffer(LiteXModule):
If(vtg_sink.valid & vtg_sink.de, If(vtg_sink.valid & vtg_sink.de,
video_pipe_source.connect(source, keep={"valid", "ready"}), video_pipe_source.connect(source, keep={"valid", "ready"}),
vtg_sink.ready.eq(source.valid & source.ready), vtg_sink.ready.eq(source.valid & source.ready),
If(video_pipe_source.valid & video_pipe_source.last,
NextState("SYNC")
)
), ),
vtg_sink.connect(source, keep={"de", "hsync", "vsync"}), vtg_sink.connect(source, keep={"de", "hsync", "vsync"}),
) )
if (depth == 32): if (depth == 32):
self.comb += [ self.comb += [
source.r.eq(video_pipe_source.data[ 0: 8]), source.r.eq(video_pipe_source.data[ 0: 8]),