From abb7f04674fa947a212053e235c5f347a037e2c6 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sat, 12 Feb 2022 10:33:54 -0500 Subject: [PATCH] panfrost: Inline pan_emit_sfbd_tiler Easier to read, the common code was already common. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/lib/pan_cs.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/panfrost/lib/pan_cs.c b/src/panfrost/lib/pan_cs.c index 383438135fb..aab0c24dca0 100644 --- a/src/panfrost/lib/pan_cs.c +++ b/src/panfrost/lib/pan_cs.c @@ -718,20 +718,6 @@ GENX(pan_emit_fbd)(const struct panfrost_device *dev, return tags; } #else /* PAN_ARCH == 4 */ -static void -pan_emit_sfbd_tiler(const struct panfrost_device *dev, - const struct pan_fb_info *fb, - const struct pan_tiler_context *ctx, - void *fbd) -{ - pan_emit_midgard_tiler(dev, fb, ctx, - pan_section_ptr(fbd, FRAMEBUFFER, TILER)); - - /* All weights set to 0, nothing to do here */ - pan_section_pack(fbd, FRAMEBUFFER, PADDING_1, padding); - pan_section_pack(fbd, FRAMEBUFFER, TILER_WEIGHTS, w); -} - unsigned GENX(pan_emit_fbd)(const struct panfrost_device *dev, const struct pan_fb_info *fb, @@ -836,7 +822,14 @@ GENX(pan_emit_fbd)(const struct panfrost_device *dev, if (fb->rt_count) cfg.msaa = mali_sampling_mode(fb->rts[0].view); } - pan_emit_sfbd_tiler(dev, fb, tiler_ctx, fbd); + + pan_emit_midgard_tiler(dev, fb, tiler_ctx, + pan_section_ptr(fbd, FRAMEBUFFER, TILER)); + + /* All weights set to 0, nothing to do here */ + pan_section_pack(fbd, FRAMEBUFFER, TILER_WEIGHTS, w); + + pan_section_pack(fbd, FRAMEBUFFER, PADDING_1, padding); pan_section_pack(fbd, FRAMEBUFFER, PADDING_2, padding); return 0; }