framebuffer/dvi: minor fixes

This commit is contained in:
Sebastien Bourdeauducq 2013-09-18 17:14:11 +02:00
parent ea0503173d
commit 1672c4a176
3 changed files with 6 additions and 3 deletions

View file

@ -17,7 +17,7 @@ INST "mxcrg/wr_bufpll" LOC = "BUFPLL_X0Y2";
INST "mxcrg/rd_bufpll" LOC = "BUFPLL_X0Y3"; INST "mxcrg/rd_bufpll" LOC = "BUFPLL_X0Y3";
PIN "mxcrg/bufg_x1.O" CLOCK_DEDICATED_ROUTE = FALSE; 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"): if hasattr(soc, "fb"):

View file

@ -145,6 +145,9 @@ class PHY(Module):
self.submodules.es1 = _EncoderSerializer(serdesstrobe, pads.data1_p, pads.data1_n) self.submodules.es1 = _EncoderSerializer(serdesstrobe, pads.data1_p, pads.data1_n)
self.submodules.es2 = _EncoderSerializer(serdesstrobe, pads.data2_p, pads.data2_n) self.submodules.es2 = _EncoderSerializer(serdesstrobe, pads.data2_p, pads.data2_n)
self.comb += [ 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.es0.c.eq(Cat(self.hsync, self.vsync)),
self.es1.c.eq(0), self.es1.c.eq(0),
self.es2.c.eq(0), self.es2.c.eq(0),

View file

@ -141,8 +141,8 @@ class _Clocking(Module, AutoCSR):
Instance("BUFPLL", p_DIVIDE=5, Instance("BUFPLL", p_DIVIDE=5,
i_PLLIN=pll_clk0, i_GCLK=ClockSignal("pix2x"), i_LOCKED=pll_locked, 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), 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_clk1, o_O=self.cd_pix2x.clk),
Instance("BUFG", i_I=pll_clk2, o_O=self.cd_pix.clk), Instance("BUFG", name="dviout_pix_bufg", i_I=pll_clk2, o_O=self.cd_pix.clk),
MultiReg(locked_async, mult_locked, "sys") MultiReg(locked_async, mult_locked, "sys")
] ]