amd: fix typo in shadowed uconfig registers on gfx11
authorMarek Olšák <marek.olsak@amd.com>
Fri, 27 Jan 2023 23:02:37 +0000 (18:02 -0500)
committerEric Engestrom <eric@engestrom.ch>
Wed, 8 Feb 2023 20:34:43 +0000 (20:34 +0000)
It used an invalid offset, which hung.

Fixes: f24f8665dbe2a - ac: implement register shadowing for gfx11

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21041>
(cherry picked from commit 76472c850b7f93a5389c473a9cf87685ad97cb72)

.pick_status.json
src/amd/common/ac_shadowed_regs.c

index 2a0588f..53748b9 100644 (file)
         "description": "amd: fix typo in shadowed uconfig registers on gfx11",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f24f8665dbe2a03f9f60baff015aa1b78c74256b"
     },
index 65a49bd..a532d2d 100644 (file)
@@ -1120,8 +1120,8 @@ static const struct ac_reg_range Gfx11UserConfigShadowRange[] =
       R_03092C_GE_MULTI_PRIM_IB_RESET_EN - R_030924_GE_MIN_VTX_INDX + 4,
    },
    {
-      R_008974_VGT_NUM_INSTANCES,
-      R_030940_VGT_TF_MEMORY_BASE - R_008974_VGT_NUM_INSTANCES + 4,
+      R_030934_VGT_NUM_INSTANCES,
+      R_030940_VGT_TF_MEMORY_BASE - R_030934_VGT_NUM_INSTANCES + 4,
    },
    {
       R_03097C_GE_STEREO_CNTL,