rtl/gfx: implement fragment funnel

3 files changed, 85 insertions, 5 deletions

diff --git a/rtl/gfx/gfx_frag.sv b/rtl/gfx/gfx_frag.sv
index 21f111f..3598ed9 100644
--- a/rtl/gfx/gfx_frag.sv
+++ b/rtl/gfx/gfx_frag.sv
@@ -14,13 +14,24 @@ module gfx_frag
 	output frag_paint    out
 );
 
-	logic addr_stall;
+	logic funnel_valid;
+	frag_xy funnel_frag;
+
+	gfx_frag_funnel funnel
+	(
+		.frag(funnel_frag),
+		.out_ready(addr_ready),
+		.out_valid(funnel_valid),
+		.*
+	);
+
+	logic addr_ready, addr_stall;
 
 	gfx_pipeline_flow #(.STAGES(`GFX_FRAG_ADDR_STAGES)) addr_flow
 	(
 		.stall(addr_stall),
-		.in_valid(0),
-		.in_ready(),
+		.in_ready(addr_ready),
+		.in_valid(funnel_valid),
 		.out_ready(1),
 		.out_valid(),
 		.*
@@ -30,7 +41,7 @@ module gfx_frag
 	(
 		.stall(addr_stall),
 
-		.frag(),
+		.frag(funnel_frag),
 		.linear(),
 		.*
 	);
diff --git a/rtl/gfx/gfx_frag_funnel.sv b/rtl/gfx/gfx_frag_funnel.sv
new file mode 100644
index 0000000..f3458b4
--- /dev/null
+++ b/rtl/gfx/gfx_frag_funnel.sv
@@ -0,0 +1,69 @@
+`include "gfx/gfx_defs.sv"
+
+module gfx_frag_funnel
+(
+	input  logic         clk,
+	                     rst_n,
+
+	input  frag_xy_lanes fragments,
+	input  paint_lanes   in_valid,
+	output logic         in_ready,
+
+	input  logic         out_ready,
+	output logic         out_valid,
+	output frag_xy       frag
+);
+
+	logic skid_ready, stall, ready, valid;
+	frag_xy next_frag, out;
+	paint_lanes current, next;
+	frag_xy_lanes fragments_hold;
+
+	assign ready = !(|next);
+	assign in_ready = skid_ready && ready;
+
+	gfx_skid_buf #(.WIDTH($bits(frag))) skid
+	(
+		.in(out),
+		.out(frag),
+		.*
+	);
+
+	gfx_skid_flow skid_flow
+	(
+		.in_ready(skid_ready),
+		.in_valid(valid),
+		.*
+	);
+
+	always_comb begin
+		next = 0;
+		next_frag = {($bits(next_frag)){1'bx}};
+
+		for (integer i = 0; i < `GFX_FINE_LANES; ++i)
+			if (current[i]) begin
+				next = current;
+				next[i] = 0;
+
+				next_frag = fragments_hold[i];
+			end
+	end
+
+	always_ff @(posedge clk or negedge rst_n)
+		if (!rst_n) begin
+			valid <= 0;
+			current <= 0;
+		end else if (!stall) begin
+			valid <= |current;
+			current <= ready ? in_valid : next;
+		end
+
+	always_ff @(posedge clk)
+		if (!stall) begin
+			if (ready)
+				fragments_hold <= fragments;
+
+			out <= next_frag;
+		end
+
+endmodule
diff --git a/rtl/gfx/gfx_raster_coarse.sv b/rtl/gfx/gfx_raster_coarse.sv
index 7a047ee..d2bac38 100644
--- a/rtl/gfx/gfx_raster_coarse.sv
+++ b/rtl/gfx/gfx_raster_coarse.sv
@@ -54,8 +54,8 @@ module gfx_raster_coarse
 
 	gfx_skid_flow skid_flow
 	(
-		.in_valid(send),
 		.in_ready(skid_ready),
+		.in_valid(send),
 		.*
 	);