drm/amdkfd: Replace deprecated gfx12 trap handler instructions

Newer assemblers reject S_WAITCNT. All instances of S_WAITCNT can be
replaced by S_WAITCNT 0 (< gfx12) or S_WAIT_IDLE (>= gfx12) since
there is no concurrency of different memory instruction classes.

Signed-off-by: Jay Cornwall <jay.cornwall@amd.com>
Reviewed-by: Lancelot Six <lancelot.six@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 70 insertions, 70 deletions

diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
index 11d076eb770c..d61b2c3bd0ac 100644
--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
+++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
@@ -711,12 +711,12 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
 	0xbf0d8f7b, 0xbf840002,
 	0x887bff7b, 0xffff0000,
 	0xf4011bbd, 0xfa000010,
-	0xbf8cc07f, 0x8f6e976e,
+	0xbf8c0000, 0x8f6e976e,
 	0x8a77ff77, 0x00800000,
 	0x88776e77, 0xf4051bbd,
-	0xfa000000, 0xbf8cc07f,
+	0xfa000000, 0xbf8c0000,
 	0xf4051ebd, 0xfa000008,
-	0xbf8cc07f, 0x87ee6e6e,
+	0xbf8c0000, 0x87ee6e6e,
 	0xbf840001, 0xbe80206e,
 	0x876eff6d, 0x00ff0000,
 	0xbf850008, 0x876eff6d,
@@ -1185,7 +1185,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
 	0x785d0000, 0xe0304080,
 	0x785d0100, 0xe0304100,
 	0x785d0200, 0xe0304180,
-	0x785d0300, 0xbf8c3f70,
+	0x785d0300, 0xbf8c0000,
 	0x7e008500, 0x7e028501,
 	0x7e048502, 0x7e068503,
 	0x807c847c, 0x8078ff78,
@@ -1194,7 +1194,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
 	0x6e5d0000, 0xe0304080,
 	0x6e5d0100, 0xe0304100,
 	0x6e5d0200, 0xe0304180,
-	0x6e5d0300, 0xbf8c3f70,
+	0x6e5d0300, 0xbf8c0000,
 	0xbf820034, 0xbef603ff,
 	0x01000000, 0xbeee0378,
 	0x8078ff78, 0x00000400,
@@ -1203,7 +1203,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
 	0x785d0000, 0xe0304100,
 	0x785d0100, 0xe0304200,
 	0x785d0200, 0xe0304300,
-	0x785d0300, 0xbf8c3f70,
+	0x785d0300, 0xbf8c0000,
 	0x7e008500, 0x7e028501,
 	0x7e048502, 0x7e068503,
 	0x807c847c, 0x8078ff78,
@@ -1213,7 +1213,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
 	0x8f6f836f, 0x806f7c6f,
 	0xbefe03c1, 0xbeff0380,
 	0xe0304000, 0x785d0000,
-	0xbf8c3f70, 0x7e008500,
+	0xbf8c0000, 0x7e008500,
 	0x807c817c, 0x8078ff78,
 	0x00000080, 0xbf0a6f7c,
 	0xbf85fff7, 0xbeff03c1,
@@ -1221,7 +1221,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
 	0xe0304100, 0x6e5d0100,
 	0xe0304200, 0x6e5d0200,
 	0xe0304300, 0x6e5d0300,
-	0xbf8c3f70, 0xb9783a05,
+	0xbf8c0000, 0xb9783a05,
 	0x80788178, 0xbf0d9972,
 	0xbf850002, 0x8f788978,
 	0xbf820001, 0x8f788a78,
@@ -1232,16 +1232,16 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
 	0x01000000, 0xbefc03ff,
 	0x0000006c, 0x80f89078,
 	0xf429003a, 0xf0000000,
-	0xbf8cc07f, 0x80fc847c,
+	0xbf8c0000, 0x80fc847c,
 	0xbf800000, 0xbe803100,
 	0xbe823102, 0x80f8a078,
 	0xf42d003a, 0xf0000000,
-	0xbf8cc07f, 0x80fc887c,
+	0xbf8c0000, 0x80fc887c,
 	0xbf800000, 0xbe803100,
 	0xbe823102, 0xbe843104,
 	0xbe863106, 0x80f8c078,
 	0xf431003a, 0xf0000000,
-	0xbf8cc07f, 0x80fc907c,
+	0xbf8c0000, 0x80fc907c,
 	0xbf800000, 0xbe803100,
 	0xbe823102, 0xbe843104,
 	0xbe863106, 0xbe883108,
@@ -1271,9 +1271,9 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
 	0xf4211cfa, 0xf0000000,
 	0x80788478, 0xf4211bba,
 	0xf0000000, 0x80788478,
-	0xbf8cc07f, 0xb9eef814,
+	0xbf8c0000, 0xb9eef814,
 	0xf4211bba, 0xf0000000,
-	0x80788478, 0xbf8cc07f,
+	0x80788478, 0xbf8c0000,
 	0xb9eef815, 0xbefc036f,
 	0xbefe0370, 0xbeff0371,
 	0xb9f9f816, 0xb9fbf803,
@@ -1288,7 +1288,7 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
 	0x0000ffff, 0xf4091c37,
 	0xfa000050, 0xf4091d37,
 	0xfa000060, 0xf4011e77,
-	0xfa000074, 0xbf8cc07f,
+	0xfa000074, 0xbf8c0000,
 	0x906e8977, 0x876fff6e,
 	0x003f8000, 0x906e8677,
 	0x876eff6e, 0x02000000,
@@ -2299,12 +2299,12 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0xbf0d8f7b, 0xbf840002,
 	0x887bff7b, 0xffff0000,
 	0xf4011bbd, 0xfa000010,
-	0xbf8cc07f, 0x8f6e976e,
+	0xbf8c0000, 0x8f6e976e,
 	0x8a77ff77, 0x00800000,
 	0x88776e77, 0xf4051bbd,
-	0xfa000000, 0xbf8cc07f,
+	0xfa000000, 0xbf8c0000,
 	0xf4051ebd, 0xfa000008,
-	0xbf8cc07f, 0x87ee6e6e,
+	0xbf8c0000, 0x87ee6e6e,
 	0xbf840001, 0xbe80206e,
 	0x876eff6d, 0x00ff0000,
 	0xbf850008, 0x876eff6d,
@@ -2319,7 +2319,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0x0000ffff, 0xbefa0380,
 	0xb9fa0283, 0xbeee037e,
 	0xbeef037f, 0xbefe0480,
-	0xbf900004, 0xbf8cc07f,
+	0xbf900004, 0xbf8c0000,
 	0x877aff7f, 0x04000000,
 	0x8f7a857a, 0x886d7a6d,
 	0x7e008200, 0xbefa037e,
@@ -2595,7 +2595,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0xe0304080, 0x785d0100,
 	0xe0304100, 0x785d0200,
 	0xe0304180, 0x785d0300,
-	0xbf8c3f70, 0x7e008500,
+	0xbf8c0000, 0x7e008500,
 	0x7e028501, 0x7e048502,
 	0x7e068503, 0x807c847c,
 	0x8078ff78, 0x00000200,
@@ -2604,7 +2604,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0xe0304080, 0x6e5d0100,
 	0xe0304100, 0x6e5d0200,
 	0xe0304180, 0x6e5d0300,
-	0xbf8c3f70, 0xbf820034,
+	0xbf8c0000, 0xbf820034,
 	0xbef603ff, 0x01000000,
 	0xbeee0378, 0x8078ff78,
 	0x00000400, 0xbefc0384,
@@ -2613,7 +2613,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0xe0304100, 0x785d0100,
 	0xe0304200, 0x785d0200,
 	0xe0304300, 0x785d0300,
-	0xbf8c3f70, 0x7e008500,
+	0xbf8c0000, 0x7e008500,
 	0x7e028501, 0x7e048502,
 	0x7e068503, 0x807c847c,
 	0x8078ff78, 0x00000400,
@@ -2622,7 +2622,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0xbf84000e, 0x8f6f836f,
 	0x806f7c6f, 0xbefe03c1,
 	0xbeff0380, 0xe0304000,
-	0x785d0000, 0xbf8c3f70,
+	0x785d0000, 0xbf8c0000,
 	0x7e008500, 0x807c817c,
 	0x8078ff78, 0x00000080,
 	0xbf0a6f7c, 0xbf85fff7,
@@ -2630,7 +2630,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0x6e5d0000, 0xe0304100,
 	0x6e5d0100, 0xe0304200,
 	0x6e5d0200, 0xe0304300,
-	0x6e5d0300, 0xbf8c3f70,
+	0x6e5d0300, 0xbf8c0000,
 	0xb9783a05, 0x80788178,
 	0xbf0d9972, 0xbf850002,
 	0x8f788978, 0xbf820001,
@@ -2641,16 +2641,16 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0xbef603ff, 0x01000000,
 	0xbefc03ff, 0x0000006c,
 	0x80f89078, 0xf429003a,
-	0xf0000000, 0xbf8cc07f,
+	0xf0000000, 0xbf8c0000,
 	0x80fc847c, 0xbf800000,
 	0xbe803100, 0xbe823102,
 	0x80f8a078, 0xf42d003a,
-	0xf0000000, 0xbf8cc07f,
+	0xf0000000, 0xbf8c0000,
 	0x80fc887c, 0xbf800000,
 	0xbe803100, 0xbe823102,
 	0xbe843104, 0xbe863106,
 	0x80f8c078, 0xf431003a,
-	0xf0000000, 0xbf8cc07f,
+	0xf0000000, 0xbf8c0000,
 	0x80fc907c, 0xbf800000,
 	0xbe803100, 0xbe823102,
 	0xbe843104, 0xbe863106,
@@ -2680,10 +2680,10 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0x80788478, 0xf4211cfa,
 	0xf0000000, 0x80788478,
 	0xf4211bba, 0xf0000000,
-	0x80788478, 0xbf8cc07f,
+	0x80788478, 0xbf8c0000,
 	0xb9eef814, 0xf4211bba,
 	0xf0000000, 0x80788478,
-	0xbf8cc07f, 0xb9eef815,
+	0xbf8c0000, 0xb9eef815,
 	0xbefc036f, 0xbefe0370,
 	0xbeff0371, 0xb9fbf803,
 	0xb9f3f801, 0xb96e3a05,
@@ -2697,7 +2697,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
 	0x0000ffff, 0xf4091c37,
 	0xfa000050, 0xf4091d37,
 	0xfa000060, 0xf4011e77,
-	0xfa000074, 0xbf8cc07f,
+	0xfa000074, 0xbf8c0000,
 	0x876dff6d, 0x0000ffff,
 	0x87fe7e7e, 0x87ea6a6a,
 	0xb9faf802, 0xbe80226c,
@@ -2731,16 +2731,16 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0x8b6eff6e, 0x00000800,
 	0xbfa20003, 0x8b6eff7b,
 	0x00000400, 0xbfa2002a,
-	0xbefa4d82, 0xbf89fc07,
+	0xbefa4d82, 0xbf890000,
 	0x84fa887a, 0xbf0d8f7b,
 	0xbfa10002, 0x8c7bff7b,
 	0xffff0000, 0xf4005bbd,
-	0xf8000010, 0xbf89fc07,
+	0xf8000010, 0xbf890000,
 	0x846e976e, 0x9177ff77,
 	0x00800000, 0x8c776e77,
 	0xf4045bbd, 0xf8000000,
-	0xbf89fc07, 0xf4045ebd,
-	0xf8000008, 0xbf89fc07,
+	0xbf890000, 0xf4045ebd,
+	0xf8000008, 0xbf890000,
 	0x8bee6e6e, 0xbfa10001,
 	0xbe80486e, 0x8b6eff6d,
 	0x00ff0000, 0xbfa20008,
@@ -2756,7 +2756,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0xbefa0080, 0xb97a0283,
 	0xbeee007e, 0xbeef007f,
 	0xbefe0180, 0xbefe4d84,
-	0xbf89fc07, 0x8b7aff7f,
+	0xbf890000, 0x8b7aff7f,
 	0x04000000, 0x847a857a,
 	0x8c6d7a6d, 0xbefa007e,
 	0x8b7bff7f, 0x0000ffff,
@@ -3007,13 +3007,13 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0x857d9972, 0x8b7d817d,
 	0xbf06817d, 0xbefd0080,
 	0xbfa2000c, 0xe0500000,
-	0x781d0000, 0xbf8903f7,
+	0x781d0000, 0xbf890000,
 	0xdac00000, 0x00000000,
 	0x807dff7d, 0x00000080,
 	0x8078ff78, 0x00000080,
 	0xbf0a6f7d, 0xbfa2fff5,
 	0xbfa0000b, 0xe0500000,
-	0x781d0000, 0xbf8903f7,
+	0x781d0000, 0xbf890000,
 	0xdac00000, 0x00000000,
 	0x807dff7d, 0x00000100,
 	0x8078ff78, 0x00000100,
@@ -3034,7 +3034,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0xe0505080, 0x781d0100,
 	0xe0505100, 0x781d0200,
 	0xe0505180, 0x781d0300,
-	0xbf8903f7, 0x7e008500,
+	0xbf890000, 0x7e008500,
 	0x7e028501, 0x7e048502,
 	0x7e068503, 0x807d847d,
 	0x8078ff78, 0x00000200,
@@ -3043,7 +3043,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0xe0505080, 0x6e1d0100,
 	0xe0505100, 0x6e1d0200,
 	0xe0505180, 0x6e1d0300,
-	0xbf8903f7, 0xbfa00034,
+	0xbf890000, 0xbfa00034,
 	0xbef600ff, 0x01000000,
 	0xbeee0078, 0x8078ff78,
 	0x00000400, 0xbefd0084,
@@ -3052,7 +3052,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0xe0505100, 0x781d0100,
 	0xe0505200, 0x781d0200,
 	0xe0505300, 0x781d0300,
-	0xbf8903f7, 0x7e008500,
+	0xbf890000, 0x7e008500,
 	0x7e028501, 0x7e048502,
 	0x7e068503, 0x807d847d,
 	0x8078ff78, 0x00000400,
@@ -3061,7 +3061,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0xbfa1000e, 0x846f836f,
 	0x806f7d6f, 0xbefe00c1,
 	0xbeff0080, 0xe0505000,
-	0x781d0000, 0xbf8903f7,
+	0x781d0000, 0xbf890000,
 	0x7e008500, 0x807d817d,
 	0x8078ff78, 0x00000080,
 	0xbf0a6f7d, 0xbfa2fff7,
@@ -3069,7 +3069,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0x6e1d0000, 0xe0505100,
 	0x6e1d0100, 0xe0505200,
 	0x6e1d0200, 0xe0505300,
-	0x6e1d0300, 0xbf8903f7,
+	0x6e1d0300, 0xbf890000,
 	0xb8f83b05, 0x80788178,
 	0xbf0d9972, 0xbfa20002,
 	0x84788978, 0xbfa00001,
@@ -3080,16 +3080,16 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0xbef600ff, 0x01000000,
 	0xbefd00ff, 0x0000006c,
 	0x80f89078, 0xf428403a,
-	0xf0000000, 0xbf89fc07,
+	0xf0000000, 0xbf890000,
 	0x80fd847d, 0xbf800000,
 	0xbe804300, 0xbe824302,
 	0x80f8a078, 0xf42c403a,
-	0xf0000000, 0xbf89fc07,
+	0xf0000000, 0xbf890000,
 	0x80fd887d, 0xbf800000,
 	0xbe804300, 0xbe824302,
 	0xbe844304, 0xbe864306,
 	0x80f8c078, 0xf430403a,
-	0xf0000000, 0xbf89fc07,
+	0xf0000000, 0xbf890000,
 	0x80fd907d, 0xbf800000,
 	0xbe804300, 0xbe824302,
 	0xbe844304, 0xbe864306,
@@ -3119,10 +3119,10 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0x80788478, 0xf4205cfa,
 	0xf0000000, 0x80788478,
 	0xf4205bba, 0xf0000000,
-	0x80788478, 0xbf89fc07,
+	0x80788478, 0xbf890000,
 	0xb96ef814, 0xf4205bba,
 	0xf0000000, 0x80788478,
-	0xbf89fc07, 0xb96ef815,
+	0xbf890000, 0xb96ef815,
 	0xbefd006f, 0xbefe0070,
 	0xbeff0071, 0xb97bf803,
 	0xb973f801, 0xb8ee3b05,
@@ -3136,7 +3136,7 @@ static const uint32_t cwsr_trap_gfx11_hex[] = {
 	0x0000ffff, 0xf4085c37,
 	0xf8000050, 0xf4085d37,
 	0xf8000060, 0xf4005e77,
-	0xf8000074, 0xbf89fc07,
+	0xf8000074, 0xbf890000,
 	0x8b6dff6d, 0x0000ffff,
 	0x8bfe7e7e, 0x8bea6a6a,
 	0xb8eef802, 0xbf0d866e,
@@ -3657,16 +3657,16 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x8b6fff6f, 0x00000200,
 	0xbfa20002, 0x8b6ea07b,
 	0xbfa2002b, 0xbefa4d82,
-	0xbf89fc07, 0x84fa887a,
+	0xbf8a0000, 0x84fa887a,
 	0xbf0d8f7b, 0xbfa10002,
 	0x8c7bff7b, 0xffff0000,
 	0xf4601bbd, 0xf8000010,
-	0xbf89fc07, 0x846e976e,
+	0xbf8a0000, 0x846e976e,
 	0x9177ff77, 0x00800000,
 	0x8c776e77, 0xf4603bbd,
-	0xf8000000, 0xbf89fc07,
+	0xf8000000, 0xbf8a0000,
 	0xf4603ebd, 0xf8000008,
-	0xbf89fc07, 0x8bee6e6e,
+	0xbf8a0000, 0x8bee6e6e,
 	0xbfa10001, 0xbe80486e,
 	0x8b6eff6d, 0xf0000000,
 	0xbfa20009, 0xb8eef811,
@@ -3682,7 +3682,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0xbefa0080, 0xb97a0151,
 	0xbeee007e, 0xbeef007f,
 	0xbefe0180, 0xbefe4d84,
-	0xbf89fc07, 0x8b7aff7f,
+	0xbf8a0000, 0x8b7aff7f,
 	0x04000000, 0x847a857a,
 	0x8c6d7a6d, 0xbefa007e,
 	0x8b7bff7f, 0x0000ffff,
@@ -3869,7 +3869,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x00000080, 0xbf800000,
 	0xbf800000, 0xbf800000,
 	0xd8d80000, 0x01000000,
-	0xbf890000, 0xc4068070,
+	0xbf8a0000, 0xc4068070,
 	0x008ce801, 0x00000000,
 	0x807d037d, 0x80700370,
 	0xd5250000, 0x0001ff00,
@@ -3878,7 +3878,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0xbe8300ff, 0x00000100,
 	0xbf800000, 0xbf800000,
 	0xbf800000, 0xd8d80000,
-	0x01000000, 0xbf890000,
+	0x01000000, 0xbf8a0000,
 	0xc4068070, 0x008ce801,
 	0x00000000, 0x807d037d,
 	0x80700370, 0xd5250000,
@@ -3954,14 +3954,14 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x8b7d817d, 0xbf06817d,
 	0xbefd0080, 0xbfa2000d,
 	0xc4050078, 0x0080e800,
-	0x00000000, 0xbf8903f7,
+	0x00000000, 0xbf8a0000,
 	0xdac00000, 0x00000000,
 	0x807dff7d, 0x00000080,
 	0x8078ff78, 0x00000080,
 	0xbf0a6f7d, 0xbfa2fff4,
 	0xbfa0000c, 0xc4050078,
 	0x0080e800, 0x00000000,
-	0xbf8903f7, 0xdac00000,
+	0xbf8a0000, 0xdac00000,
 	0x00000000, 0x807dff7d,
 	0x00000100, 0x8078ff78,
 	0x00000100, 0xbf0a6f7d,
@@ -3983,7 +3983,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x00008000, 0xc4050078,
 	0x008ce802, 0x00010000,
 	0xc4050078, 0x008ce803,
-	0x00018000, 0xbf8903f7,
+	0x00018000, 0xbf8a0000,
 	0x7e008500, 0x7e028501,
 	0x7e048502, 0x7e068503,
 	0x807d847d, 0x8078ff78,
@@ -3994,7 +3994,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x00008000, 0xc405006e,
 	0x008ce802, 0x00010000,
 	0xc405006e, 0x008ce803,
-	0x00018000, 0xbf8903f7,
+	0x00018000, 0xbf8a0000,
 	0xbfa0003d, 0xbef600ff,
 	0x01000000, 0xbeee0078,
 	0x8078ff78, 0x00000400,
@@ -4005,7 +4005,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x00010000, 0xc4050078,
 	0x008ce802, 0x00020000,
 	0xc4050078, 0x008ce803,
-	0x00030000, 0xbf8903f7,
+	0x00030000, 0xbf8a0000,
 	0x7e008500, 0x7e028501,
 	0x7e048502, 0x7e068503,
 	0x807d847d, 0x8078ff78,
@@ -4015,7 +4015,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x846f836f, 0x806f7d6f,
 	0xbefe00c1, 0xbeff0080,
 	0xc4050078, 0x008ce800,
-	0x00000000, 0xbf8903f7,
+	0x00000000, 0xbf8a0000,
 	0x7e008500, 0x807d817d,
 	0x8078ff78, 0x00000080,
 	0xbf0a6f7d, 0xbfa2fff6,
@@ -4025,7 +4025,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x00010000, 0xc405006e,
 	0x008ce802, 0x00020000,
 	0xc405006e, 0x008ce803,
-	0x00030000, 0xbf8903f7,
+	0x00030000, 0xbf8a0000,
 	0xb8f83b05, 0x80788178,
 	0xbf0d9972, 0xbfa20002,
 	0x84788978, 0xbfa00001,
@@ -4036,16 +4036,16 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0xbef600ff, 0x01000000,
 	0xbefd00ff, 0x0000006c,
 	0x80f89078, 0xf462403a,
-	0xf0000000, 0xbf89fc07,
+	0xf0000000, 0xbf8a0000,
 	0x80fd847d, 0xbf800000,
 	0xbe804300, 0xbe824302,
 	0x80f8a078, 0xf462603a,
-	0xf0000000, 0xbf89fc07,
+	0xf0000000, 0xbf8a0000,
 	0x80fd887d, 0xbf800000,
 	0xbe804300, 0xbe824302,
 	0xbe844304, 0xbe864306,
 	0x80f8c078, 0xf462803a,
-	0xf0000000, 0xbf89fc07,
+	0xf0000000, 0xbf8a0000,
 	0x80fd907d, 0xbf800000,
 	0xbe804300, 0xbe824302,
 	0xbe844304, 0xbe864306,
@@ -4075,19 +4075,19 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x80788478, 0xf4621cfa,
 	0xf0000000, 0x80788478,
 	0xf4621bba, 0xf0000000,
-	0x80788478, 0xbf89fc07,
+	0x80788478, 0xbf8a0000,
 	0xb96ef814, 0xf4621bba,
 	0xf0000000, 0x80788478,
-	0xbf89fc07, 0xb96ef815,
+	0xbf8a0000, 0xb96ef815,
 	0xf4621bba, 0xf0000000,
-	0x80788478, 0xbf89fc07,
+	0x80788478, 0xbf8a0000,
 	0xb96ef812, 0xf4621bba,
 	0xf0000000, 0x80788478,
-	0xbf89fc07, 0xb96ef813,
+	0xbf8a0000, 0xb96ef813,
 	0x8b6eff7f, 0x04000000,
 	0xbfa1000d, 0x80788478,
 	0xf4621bba, 0xf0000000,
-	0x80788478, 0xbf89fc07,
+	0x80788478, 0xbf8a0000,
 	0xbf0d806e, 0xbfa10006,
 	0x856e906e, 0x8b6e6e6e,
 	0xbfa10003, 0xbe804ec1,
@@ -4106,7 +4106,7 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
 	0x0000ffff, 0xf4605c37,
 	0xf8000050, 0xf4605d37,
 	0xf8000060, 0xf4601e77,
-	0xf8000074, 0xbf89fc07,
+	0xf8000074, 0xbf8a0000,
 	0x8b6dff6d, 0x0000ffff,
 	0x8bfe7e7e, 0x8bea6a6a,
 	0xb97af804, 0xbe804a6c,