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

cores/video: Fix depth checks that have to be done in Python, not in logic. 

Fixes https://github.com/enjoy-digital/litex/issues/1198.
This commit is contained in:
Florent Kermarrec 2022-04-22 19:36:35 +02:00
parent 1a713225ea
commit 625261c693
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -656,10 +656,11 @@ class VideoFrameBuffer(Module, AutoCSR):
# ... and then Clock Domain Crossing. # ... and then Clock Domain Crossing.
self.submodules.cdc = stream.ClockDomainCrossing([("data", depth)], cd_from="sys", cd_to=clock_domain) self.submodules.cdc = stream.ClockDomainCrossing([("data", depth)], cd_from="sys", cd_to=clock_domain)
self.comb += self.conv.source.connect(self.cdc.sink) self.comb += self.conv.source.connect(self.cdc.sink)
self.comb += If((dram_port.data_width < depth) and (depth == 32), # FIXME. if (dram_port.data_width < depth) and (depth == 32): # FIXME.
self.cdc.sink.data[ 0: 8].eq(self.conv.source.data[16:24]), self.comb += [
self.cdc.sink.data[16:24].eq(self.conv.source.data[ 0: 8]), self.cdc.sink.data[ 0: 8].eq(self.conv.source.data[16:24]),
) self.cdc.sink.data[16:24].eq(self.conv.source.data[ 0: 8]),
]
video_pipe_source = self.cdc.source video_pipe_source = self.cdc.source
# Video Generation. # Video Generation.
@ -671,16 +672,19 @@ class VideoFrameBuffer(Module, AutoCSR):
), ),
vtg_sink.connect(source, keep={"de", "hsync", "vsync"}), vtg_sink.connect(source, keep={"de", "hsync", "vsync"}),
If(depth == 32, ]
if (depth == 32):
self.comb += [
source.r.eq(video_pipe_source.data[16:24]), source.r.eq(video_pipe_source.data[16:24]),
source.g.eq(video_pipe_source.data[ 8:16]), source.g.eq(video_pipe_source.data[ 8:16]),
source.b.eq(video_pipe_source.data[ 0: 8]), source.b.eq(video_pipe_source.data[ 0: 8]),
).Else( # depth == 16 ]
else: # depth == 16
self.comb += [
source.r.eq(Cat(Signal(3, reset = 0), video_pipe_source.data[ 0: 5])), source.r.eq(Cat(Signal(3, reset = 0), video_pipe_source.data[ 0: 5])),
source.g.eq(Cat(Signal(2, reset = 0), video_pipe_source.data[ 5:11])), source.g.eq(Cat(Signal(2, reset = 0), video_pipe_source.data[ 5:11])),
source.b.eq(Cat(Signal(3, reset = 0), video_pipe_source.data[11:16])), source.b.eq(Cat(Signal(3, reset = 0), video_pipe_source.data[11:16])),
) ]
]
# Underflow. # Underflow.
self.comb += self.underflow.eq(~source.valid) self.comb += self.underflow.eq(~source.valid)