Module: Mesa Branch: staging/21.3 Commit: 06cd2cb37200821b44856b3c22dc7b6d07ffaf71 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=06cd2cb37200821b44856b3c22dc7b6d07ffaf71
Author: Rob Clark <[email protected]> Date: Thu Dec 2 16:10:39 2021 -0800 freedreno/computerator: Fix @buf header Order is important in the grammar, the more specific match needs to go first. Fixes: ba1c989348d ("freedreno/computerator: pass iova of buffer to const register") Signed-off-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14231> (cherry picked from commit d1edc6d9a14cd8f53d6c308a55b2d9ace4675c79) --- .pick_status.json | 2 +- src/freedreno/ir3/ir3_parser.y | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c7aea0f28e6..3e403257e01 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -571,7 +571,7 @@ "description": "freedreno/computerator: Fix @buf header", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ba1c989348de066b35678fb1e6151dccd26831eb" }, diff --git a/src/freedreno/ir3/ir3_parser.y b/src/freedreno/ir3/ir3_parser.y index 3be8fa0426b..acd94b35a01 100644 --- a/src/freedreno/ir3/ir3_parser.y +++ b/src/freedreno/ir3/ir3_parser.y @@ -674,7 +674,7 @@ const_header: T_A_CONST '(' T_CONSTANT ')' const_val ',' const_val ',' cons } buf_header_addr_reg: -| '(' T_CONSTANT ')' { + '(' T_CONSTANT ')' { assert(($2 & 0x1) == 0); /* half-reg not allowed */ unsigned reg = $2 >> 1; @@ -682,6 +682,7 @@ buf_header_addr_reg: /* reserve space in immediates for the actual value to be plugged in later: */ add_const($2, 0, 0, 0, 0); } +| buf_header: T_A_BUF const_val { int idx = info->num_bufs++;
