From 1672c4a176ac363d1d2c84421395cfb7c1e15074 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 18 Sep 2013 17:14:11 +0200 Subject: [PATCH] framebuffer/dvi: minor fixes --- make.py | 2 +- milkymist/framebuffer/dvi.py | 3 +++ milkymist/framebuffer/phy.py | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/make.py b/make.py index f62dd0e9..feb0141a 100755 --- a/make.py +++ b/make.py @@ -17,7 +17,7 @@ INST "mxcrg/wr_bufpll" LOC = "BUFPLL_X0Y2"; INST "mxcrg/rd_bufpll" LOC = "BUFPLL_X0Y3"; PIN "mxcrg/bufg_x1.O" CLOCK_DEDICATED_ROUTE = FALSE; -PIN "pix2x_bufg.O" CLOCK_DEDICATED_ROUTE = FALSE; +PIN "dviout_pix_bufg.O" CLOCK_DEDICATED_ROUTE = FALSE; """) if hasattr(soc, "fb"): diff --git a/milkymist/framebuffer/dvi.py b/milkymist/framebuffer/dvi.py index 5475857b..9c085079 100644 --- a/milkymist/framebuffer/dvi.py +++ b/milkymist/framebuffer/dvi.py @@ -145,6 +145,9 @@ class PHY(Module): self.submodules.es1 = _EncoderSerializer(serdesstrobe, pads.data1_p, pads.data1_n) self.submodules.es2 = _EncoderSerializer(serdesstrobe, pads.data2_p, pads.data2_n) self.comb += [ + self.es0.d.eq(self.r), + self.es1.d.eq(self.g), + self.es2.d.eq(self.b), self.es0.c.eq(Cat(self.hsync, self.vsync)), self.es1.c.eq(0), self.es2.c.eq(0), diff --git a/milkymist/framebuffer/phy.py b/milkymist/framebuffer/phy.py index 90de7b0a..0fbc65d7 100644 --- a/milkymist/framebuffer/phy.py +++ b/milkymist/framebuffer/phy.py @@ -141,8 +141,8 @@ class _Clocking(Module, AutoCSR): Instance("BUFPLL", p_DIVIDE=5, i_PLLIN=pll_clk0, i_GCLK=ClockSignal("pix2x"), i_LOCKED=pll_locked, o_IOCLK=self.cd_pix10x.clk, o_LOCK=locked_async, o_SERDESSTROBE=self.serdesstrobe), - Instance("BUFG", name="pix2x_bufg", i_I=pll_clk1, o_O=self.cd_pix2x.clk), - Instance("BUFG", i_I=pll_clk2, o_O=self.cd_pix.clk), + Instance("BUFG", i_I=pll_clk1, o_O=self.cd_pix2x.clk), + Instance("BUFG", name="dviout_pix_bufg", i_I=pll_clk2, o_O=self.cd_pix.clk), MultiReg(locked_async, mult_locked, "sys") ] -- 2.30.2