From 7bc3730b3f4a8ec24db8002e378f648be6425cf1 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 21 May 2021 17:30:34 -0400 Subject: [PATCH] panfrost: Lower max inputs again Due to Midgard ABI silliness. We could fix this properly but I'm not aware of any app that needs more than 16, so let's just revert to the behaviour matching the DDK. Fixes: fdbf8c96fe2 ("panfrost: Use natural shader limits") Signed-off-by: Alyssa Rosenzweig Part-of: --- src/gallium/drivers/panfrost/pan_screen.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c index aee8241c2a3..d3d232309c5 100644 --- a/src/gallium/drivers/panfrost/pan_screen.c +++ b/src/gallium/drivers/panfrost/pan_screen.c @@ -347,9 +347,8 @@ panfrost_get_shader_param(struct pipe_screen *screen, return 1024; /* arbitrary */ case PIPE_SHADER_CAP_MAX_INPUTS: - /* Hardware limit is 4095 but we have driver internal inputs */ - STATIC_ASSERT(PIPE_MAX_ATTRIBS < (0x1000 - 16)); - return PIPE_MAX_ATTRIBS; + /* Used as ABI on Midgard */ + return 16; case PIPE_SHADER_CAP_MAX_OUTPUTS: return shader == PIPE_SHADER_FRAGMENT ? 8 : PIPE_MAX_ATTRIBS;