From d331e4edcdc121f38c7512ea55c22d8652fbae68 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 10 Jun 2022 11:43:53 -0400 Subject: [PATCH] panfrost: Inline pan_fbd_has_zs_crc_ext It has a single user -- in a section of code that only runs for MFBD GPUs and that has already decided whether to use CRCs -- so inlining it simplifies its definition greatly and may avoid redeciding the CRC setting. [Note for mesa-stable maintainers: This is not a bug fix but is marked for backport so the next patch applies cleanly.] Signed-off-by: Alyssa Rosenzweig Cc: mesa-stable Part-of: (cherry picked from commit cac0578ee58c5b0838ececbe2b7aa5f7c29874c3) --- .pick_status.json | 2 +- src/panfrost/lib/pan_cs.c | 2 +- src/panfrost/lib/pan_cs.h | 8 -------- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 382628062e0..0c9f725c424 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -175,7 +175,7 @@ "description": "panfrost: Inline pan_fbd_has_zs_crc_ext", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/panfrost/lib/pan_cs.c b/src/panfrost/lib/pan_cs.c index c52285a87fc..63b311509c3 100644 --- a/src/panfrost/lib/pan_cs.c +++ b/src/panfrost/lib/pan_cs.c @@ -637,7 +637,7 @@ GENX(pan_emit_fbd)(const struct panfrost_device *dev, unsigned tile_size; unsigned internal_cbuf_size = pan_internal_cbuf_size(fb, &tile_size); int crc_rt = GENX(pan_select_crc_rt)(fb); - bool has_zs_crc_ext = pan_fbd_has_zs_crc_ext(fb); + bool has_zs_crc_ext = (fb->zs.view.zs || fb->zs.view.s || crc_rt >= 0); pan_section_pack(fbd, FRAMEBUFFER, PARAMETERS, cfg) { #if PAN_ARCH >= 6 diff --git a/src/panfrost/lib/pan_cs.h b/src/panfrost/lib/pan_cs.h index 27d030efdf2..b6a5cc34321 100644 --- a/src/panfrost/lib/pan_cs.h +++ b/src/panfrost/lib/pan_cs.h @@ -151,14 +151,6 @@ GENX(pan_emit_tls)(const struct pan_tls_info *info, int GENX(pan_select_crc_rt)(const struct pan_fb_info *fb); -static inline bool -pan_fbd_has_zs_crc_ext(const struct pan_fb_info *fb) -{ - return PAN_ARCH >= 5 && - (fb->zs.view.zs || fb->zs.view.s || - GENX(pan_select_crc_rt)(fb) >= 0); -} - unsigned GENX(pan_emit_fbd)(const struct panfrost_device *dev, const struct pan_fb_info *fb,