framebuffer/dvi: minor fixes

diff --git a/make.py b/make.py
index f62dd0e93be35d8d444b3f0e8cc202a4ad90f8ad..feb0141abfb0930c7ebc3015d75934184d4f7401 100755 (executable)
--- 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 5475857be4aae8caf3b9167028da32ae15e12062..9c085079cfd56b9eb48899877cc2994d3216dbeb 100644 (file)
--- 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 90de7b0a954a59336a5547cc2930c6949ea7be79..0fbc65d79714fd43d9907249d6a59a80475c032c 100644 (file)
--- 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")
                        ]