Module: Mesa Branch: staging/21.2 Commit: 14f09b60e5dc588d8e6c60577a095e43a7edafc1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=14f09b60e5dc588d8e6c60577a095e43a7edafc1
Author: Dave Airlie <[email protected]> Date: Wed Jul 28 13:51:38 2021 +1000 intel/fs: restrict max push length on older GPUs to a smaller amount Fixes crash in dEQP-GLES2.functional.uniform_api.random.79 Cc: mesa-stable Reviewed-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12093> (cherry picked from commit c8783001c7350960a63bff0dc93a4e744c22b911) --- .pick_status.json | 2 +- src/intel/compiler/brw_fs.cpp | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a9cd563b448..6916371142d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -67,7 +67,7 @@ "description": "intel/fs: restrict max push length on older GPUs to a smaller amount", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index 7dbebfd3c83..add199388c1 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -2656,16 +2656,23 @@ fs_visitor::assign_constant_locations() /* Now that we know how many regular uniforms we'll push, reduce the * UBO push ranges so we don't exceed the 3DSTATE_CONSTANT limits. */ + /* For gen4/5: + * Only allow 16 registers (128 uniform components) as push constants. + * + * If changing this value, note the limitation about total_regs in + * brw_curbe.c/crocus_state.c + */ + const unsigned max_push_length = compiler->devinfo->ver < 6 ? 16 : 64; unsigned push_length = DIV_ROUND_UP(stage_prog_data->nr_params, 8); for (int i = 0; i < 4; i++) { struct brw_ubo_range *range = &prog_data->ubo_ranges[i]; - if (push_length + range->length > 64) - range->length = 64 - push_length; + if (push_length + range->length > max_push_length) + range->length = max_push_length - push_length; push_length += range->length; } - assert(push_length <= 64); + assert(push_length <= max_push_length); } bool
