OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pan/genxml: Fix inverted logic on nr_regs

Browse Source 
v10 have 96 and v12+ have 128, not the opposite.

Fixes: 811525b543 ("pan/genxml: Build libpanfrost_decode for v12")
Signed-off-by: Mary Guillemard <mary.guillemard@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34815>
(cherry picked from commit 8447f7aaae41ce88587aedb77acafb571a6763b8)
This commit is contained in:
Mary Guillemard
2025-05-05 14:52:20 +02:00
committed by Eric Engestrom
parent 867fb6756b
commit 8d2520cf95
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.pick_status.json
View File

@@ -384,7 +384,7 @@
"description": "pan/genxml: Fix inverted logic on nr_regs", "description": "pan/genxml: Fix inverted logic on nr_regs",
"nominated": true, "nominated": true,
"nomination_type": 2, "nomination_type": 2,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "811525b543b5a0581af9bb4b17bb92edbde6fe0a", "because_sha": "811525b543b5a0581af9bb4b17bb92edbde6fe0a",
"notes": null "notes": null

4
src/panfrost/lib/genxml/decode_csf.c
View File

@@ -1669,7 +1669,7 @@ GENX(pandecode_interpret_cs)(struct pandecode_context *ctx, uint64_t queue,
/* v10 has 96 registers. v12+ have 128. */ /* v10 has 96 registers. v12+ have 128. */
struct queue_ctx qctx = { struct queue_ctx qctx = {
.nr_regs = PAN_ARCH >= 12 ? 96 : 128, .nr_regs = PAN_ARCH >= 12 ? 128 : 96,
.regs = regs, .regs = regs,
.ip = cs, .ip = cs,
.end = cs + (size / 8), .end = cs + (size / 8),
@@ -2484,7 +2484,7 @@ GENX(pandecode_cs_trace)(struct pandecode_context *ctx, uint64_t trace,
/* v10 has 96 registers. v12+ have 128. */ /* v10 has 96 registers. v12+ have 128. */
struct queue_ctx qctx = { struct queue_ctx qctx = {
.nr_regs = PAN_ARCH >= 12 ? 96 : 128, .nr_regs = PAN_ARCH >= 12 ? 128 : 96,
.regs = regs, .regs = regs,
.ip = instr, .ip = instr,
.end = instr + 1, .end = instr + 1,