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

framebuffer: fix deadlock

This commit is contained in:
Sebastien Bourdeauducq 2012-07-07 00:12:34 +02:00
parent de28760913
commit ce82f188d0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
milkymist/framebuffer/__init__.py
View File

@ -2,7 +2,7 @@ from migen.fhdl.structure import *
from migen.flow.actor import * from migen.flow.actor import *
from migen.flow.network import * from migen.flow.network import *
from migen.flow import plumbing from migen.flow import plumbing
from migen.actorlib import ala, misc, dma_asmi, structuring, sim from migen.actorlib import misc, dma_asmi, structuring, sim
from migen.bank.description import * from migen.bank.description import *
from migen.bank import csrgen from migen.bank import csrgen
@ -136,9 +136,8 @@ class VTG(Actor):
If(hcounter == tp.hscan, If(hcounter == tp.hscan,
hcounter.eq(0), hcounter.eq(0),
If(vcounter == tp.vscan, If(vcounter == tp.vscan,
vcounter.eq(0) vcounter.eq(0),
# FIXME: work around Flow bug self.endpoints["timing"].ack.eq(1)
#self.endpoints["timing"].ack.eq(1)
).Else( ).Else(
vcounter.eq(vcounter + 1) vcounter.eq(vcounter + 1)
) )
@ -236,8 +235,7 @@ class Framebuffer:
packed_pixels = structuring.pack_layout(_pixel_layout, pack_factor) packed_pixels = structuring.pack_layout(_pixel_layout, pack_factor)
fi = ActorNode(_FrameInitiator(asmi_bits, length_bits, alignment_bits)) fi = ActorNode(_FrameInitiator(asmi_bits, length_bits, alignment_bits))
adrloop = ActorNode(misc.IntSequence(length_bits)) adrloop = ActorNode(misc.IntSequence(length_bits, asmi_bits))
adrbase = ActorNode(ala.Add(BV(asmi_bits)))
adrbuffer = ActorNode(plumbing.Buffer) adrbuffer = ActorNode(plumbing.Buffer)
#dma = ActorNode(dma_asmi.SequentialReader(asmiport)) #dma = ActorNode(dma_asmi.SequentialReader(asmiport))
dma = ActorNode(FakeDMA(asmiport)) dma = ActorNode(FakeDMA(asmiport))
@ -250,10 +248,8 @@ class Framebuffer:
fifo = ActorNode(FIFO()) fifo = ActorNode(FIFO())
g = DataFlowGraph() g = DataFlowGraph()
g.add_connection(fi, adrloop, source_subr=["length"]) g.add_connection(fi, adrloop, source_subr=["length", "base"])
g.add_connection(adrloop, adrbase, sink_subr=["a"]) g.add_connection(adrloop, adrbuffer)
g.add_connection(fi, adrbase, source_subr=["base"], sink_subr=["b"])
g.add_connection(adrbase, adrbuffer)
g.add_connection(adrbuffer, dma) g.add_connection(adrbuffer, dma)
g.add_connection(dma, cast) g.add_connection(dma, cast)
g.add_connection(cast, unpack) g.add_connection(cast, unpack)