morgan/artiq-zynq
1
0
Fork 0
forked from M-Labs/artiq-zynq
Code Pull Requests Activity

frameline GW: add pixel format handling

Browse Source
This commit is contained in:
morgan 2025-01-13 16:25:34 +08:00
parent 6a39f475e9
commit e0986e524d
1 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/gateware/cxp_frame_pipeline.py
View File

@ -575,32 +575,24 @@ class Frame_Deserializer(Module):
self.new_frame = Signal() self.new_frame = Signal()
self.l_size = Signal(3*char_width) self.l_size = Signal(3*char_width)
self.x_size = Signal(3*char_width) self.x_size = Signal(3*char_width)
self.pixel_format = Signal(2*char_width)
self.source = stream.Endpoint(pixel4x_layout)
# # # # # #
self.submodules.eol_inserter = eol_inserter = End_Of_Line_Inserter() self.submodules.eol_inserter = eol_inserter = End_Of_Line_Inserter()
self.sync += eol_inserter.l_size.eq(self.l_size), self.sync += eol_inserter.l_size.eq(self.l_size),
self.sink = eol_inserter.sink
gearboxes = {}
for s in [8, 10, 12, 14, 16]: for s in [8, 10, 12, 14, 16]:
gearbox = Pixel_Gearbox(s) gearbox = Pixel_Gearbox(s)
gearboxes["mono"+str(s)] = gearbox
self.submodules += gearbox self.submodules += gearbox
self.sync += gearbox.x_size.eq(self.x_size), self.sync += gearbox.x_size.eq(self.x_size),
self.comb += eol_inserter.source.connect(gearbox.sink)
self.comb += gearbox.source.ack.eq(1) # simulated a proper consumer, idk why but without this it will destory timing
# self.submodules.gearbox = gearbox = Custom_Pixel_Gearbox(8) # From Table 34 (CXP-001-2021)
# self.sync += gearbox.x_size.eq(self.x_size),
# self.comb += eol_inserter.source.connect(gearbox.sink)
self.sink = eol_inserter.sink
# self.source = gearbox.source
# # TODO: use this to control mux
# Table 34 (CXP-001-2021)
pix_fmt = { pix_fmt = {
"mono8": 0x0101, "mono8": 0x0101,
"mono10": 0x0102, "mono10": 0x0102,
@ -608,19 +600,21 @@ class Frame_Deserializer(Module):
"mono14": 0x0104, "mono14": 0x0104,
"mono16": 0x0105, "mono16": 0x0105,
} }
# self.sync += [
# pixel_format_r.eq(header_decoder.metadata.pixel_format), mux_cases = {
# Case(pixel_format_r, "default": [
# { # discard unknown pixel format data
# pix_fmt["mono8"]: pix_size.eq(8), eol_inserter.source.ack.eq(1),
# pix_fmt["mono10"]: pix_size.eq(10), ],
# pix_fmt["mono12"]: pix_size.eq(12), }
# pix_fmt["mono14"]: pix_size.eq(14), for fmt in pix_fmt:
# pix_fmt["mono16"]: pix_size.eq(16), mux_cases[pix_fmt[fmt]] = [
# "default": pix_size.eq(pix_size.reset), eol_inserter.source.connect(gearboxes[fmt].sink),
# } gearboxes[fmt].source.connect(self.source),
# ) ]
# ]
self.comb += Case(self.pixel_format, mux_cases)
class ROI_Pipeline(Module): class ROI_Pipeline(Module):
@ -639,6 +633,7 @@ class ROI_Pipeline(Module):
deserializer.new_frame.eq(header_decoder.new_frame), deserializer.new_frame.eq(header_decoder.new_frame),
deserializer.l_size.eq(header_decoder.metadata.l_size), deserializer.l_size.eq(header_decoder.metadata.l_size),
deserializer.x_size.eq(header_decoder.metadata.x_size), deserializer.x_size.eq(header_decoder.metadata.x_size),
deserializer.pixel_format.eq(header_decoder.metadata.pixel_format),
] ]
self.pipeline = [buffer, crc_checker, header_decoder, deserializer] self.pipeline = [buffer, crc_checker, header_decoder, deserializer]
@ -647,8 +642,8 @@ class ROI_Pipeline(Module):
self.sink = self.pipeline[0].sink self.sink = self.pipeline[0].sink
# DEBUG # DEBUG
# self.source = self.pipeline[-1].source self.source = self.pipeline[-1].source
# self.comb += self.source.ack.eq(1) # simulated a proper consumer, idk why but without this it will destory timing self.comb += self.source.ack.eq(1) # simulated a proper consumer, idk why but without this it will destory timing
class Frame_Packet_Router(Module): class Frame_Packet_Router(Module):
# packet size expressed in bits # packet size expressed in bits