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

soc/add_video_xy: Allow passing phy or phy's Endpoint.

This commit is contained in:
Florent Kermarrec 2021-06-15 18:10:24 +02:00
parent 6b8a35a2f8
commit 8a644c9086
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
litex/soc/integration/soc.py
View File

@ -1702,7 +1702,7 @@ class LiteXSoC(SoC):
# Connect Video Timing Generator to ColorsBars Pattern. # Connect Video Timing Generator to ColorsBars Pattern.
self.comb += [ self.comb += [
vtg.source.connect(colorbars.vtg_sink), vtg.source.connect(colorbars.vtg_sink),
colorbars.source.connect(phy.sink) colorbars.source.connect(phy if isinstance(phy, stream.Endpoint) else phy.sink)
] ]
# Add Video Terminal --------------------------------------------------------------------------- # Add Video Terminal ---------------------------------------------------------------------------
@ -1738,7 +1738,7 @@ class LiteXSoC(SoC):
] ]
# Connect Video Terminal to Video PHY. # Connect Video Terminal to Video PHY.
self.comb += vt.source.connect(phy.sink) self.comb += vt.source.connect(phy if isinstance(phy, stream.Endpoint) else phy.sink)
# Add Video Framebuffer ------------------------------------------------------------------------ # Add Video Framebuffer ------------------------------------------------------------------------
def add_video_framebuffer(self, name="video_framebuffer", phy=None, timings="800x600@60Hz", clock_domain="sys"): def add_video_framebuffer(self, name="video_framebuffer", phy=None, timings="800x600@60Hz", clock_domain="sys"):
@ -1768,7 +1768,7 @@ class LiteXSoC(SoC):
self.comb += vtg.source.connect(vfb.vtg_sink) self.comb += vtg.source.connect(vfb.vtg_sink)
# Connect Video FrameBuffer to Video PHY. # Connect Video FrameBuffer to Video PHY.
self.comb += vfb.source.connect(phy.sink) self.comb += vfb.source.connect(phy if isinstance(phy, stream.Endpoint) else phy.sink)
# Constants. # Constants.
self.add_constant("VIDEO_FRAMEBUFFER_BASE", base) self.add_constant("VIDEO_FRAMEBUFFER_BASE", base)