From 4a79bbdb3816fdaa3d00980567bc0898cde2bb09 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 24 Jun 2021 11:55:27 -0400 Subject: [PATCH] panfrost: Generalize pan_blitter's reg count assert Needed to avoid crashing on Bifrost/Valhall. Signed-off-by: Alyssa Rosenzweig Part-of: --- src/panfrost/lib/pan_blitter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/panfrost/lib/pan_blitter.c b/src/panfrost/lib/pan_blitter.c index b02e04bf449..401e48ecb6b 100644 --- a/src/panfrost/lib/pan_blitter.c +++ b/src/panfrost/lib/pan_blitter.c @@ -417,7 +417,8 @@ pan_blitter_get_blend_shaders(struct panfrost_device *dev, nir_type_float32, /* unused */ i); - assert(b->work_reg_count <= 4); + ASSERTED unsigned full_threads = (dev->arch < 7) ? 4 : 32; + assert(b->work_reg_count <= full_threads); struct panfrost_ptr bin = pan_pool_alloc_aligned(dev->blitter.shaders.pool, b->binary.size,