Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8c335d66fdd1
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 534dec62eb30
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on May 11, 2013

  1. cleanup

    Sebastien Bourdeauducq committed May 11, 2013
    Copy the full SHA
    e35315b View commit details

Commits on May 12, 2013

  1. First video mixing working (hacky)

    Sebastien Bourdeauducq committed May 12, 2013
    Copy the full SHA
    534dec6 View commit details
Showing with 11 additions and 8 deletions.
  1. +4 −0 .gitignore
  2. +1 −1 milkymist/dvisampler/analysis.py
  3. +0 −1 milkymist/framebuffer/__init__.py
  4. +1 −1 milkymist/framebuffer/lib.py
  5. +5 −5 top.py
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,3 +10,7 @@ tools/flterm
tools/mkmmimg
tools/byteswap
software/include/hw/csr.h
software/videomixer/dvisampler0.c
software/videomixer/dvisampler0.h
software/videomixer/dvisampler1.c
software/videomixer/dvisampler1.h
2 changes: 1 addition & 1 deletion milkymist/dvisampler/analysis.py
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ def __init__(self):
vsync_r.eq(self.vsync)
]

fifo = AsyncFIFO(layout_len(frame_layout), 256)
fifo = AsyncFIFO(layout_len(frame_layout), 512)
self.add_submodule(fifo, {"write": "pix", "read": "sys"})
self.comb += [
fifo.we.eq(fifo_stb),
1 change: 0 additions & 1 deletion milkymist/framebuffer/__init__.py
Original file line number Diff line number Diff line change
@@ -127,4 +127,3 @@ def __init__(self, pads, *asmiports, blender_latency=4):
pads.b.eq(fifo.vga_b),
pads.psave_n.eq(1)
]

2 changes: 1 addition & 1 deletion milkymist/framebuffer/lib.py
Original file line number Diff line number Diff line change
@@ -129,7 +129,7 @@ def __init__(self):
###

data_width = 2+2*3*bpc_dac
fifo = AsyncFIFO(data_width, 256)
fifo = AsyncFIFO(data_width, 512)
self.add_submodule(fifo, {"write": "sys", "read": "vga"})
fifo_in = self.dac.payload
fifo_out = Record(dac_layout)
10 changes: 5 additions & 5 deletions top.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@

version = get_macros("common/version.h")["VERSION"][1:-1]

clk_freq = (83 + Fraction(1, 3))*1000000
clk_freq = (62 + Fraction(1, 2))*1000000
sram_size = 4096 # in bytes
l2_size = 8192 # in bytes

@@ -93,10 +93,10 @@ def __init__(self, platform):
#
self.submodules.asmicon = asmicon.ASMIcon(sdram_phy, sdram_geom, sdram_timing)
asmiport_wb = self.asmicon.hub.get_port()
asmiport_fb0 = self.asmicon.hub.get_port(2)
asmiport_fb1 = self.asmicon.hub.get_port(2)
asmiport_dvi0 = self.asmicon.hub.get_port(2)
asmiport_dvi1 = self.asmicon.hub.get_port(2)
asmiport_fb0 = self.asmicon.hub.get_port(4)
asmiport_fb1 = self.asmicon.hub.get_port(4)
asmiport_dvi0 = self.asmicon.hub.get_port(4)
asmiport_dvi1 = self.asmicon.hub.get_port(4)
self.asmicon.finalize()

#