drm/amdkfd: Sync trap handler binary with source

Binary and source desynced during branch activity. Source merge
also introduced compile error.

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

diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
index dfffda4aa8e21f6efce678d09d4e71f397388104..6281b2f9faee3a832ff72d055afb2b6621f448b6 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
+++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
@@ -3644,7 +3644,7 @@ static const uint32_t cwsr_trap_gfx9_4_3_hex[] = {
 };
 
 static const uint32_t cwsr_trap_gfx12_hex[] = {
-       0xbfa00001, 0xbfa002b2,
+       0xbfa00001, 0xbfa00239,
        0xb0804009, 0xb8eef81a,
        0xbf880000, 0xb980081a,
        0x00000000, 0xb8f8f804,
@@ -3711,464 +3711,385 @@ static const uint32_t cwsr_trap_gfx12_hex[] = {
        0x807a817a, 0xbf0d997b,
        0xbfa20002, 0x847a897a,
        0xbfa00001, 0x847a8a7a,
-       0xb8fb1e06, 0x847b8a7b,
-       0x807a7b7a, 0x8b7bff7f,
-       0x0000ffff, 0x807aff7a,
-       0x00000200, 0x807a7e7a,
-       0x827b807b, 0xd7610000,
-       0x00010870, 0xd7610000,
-       0x00010a71, 0xd7610000,
-       0x00010c72, 0xd7610000,
-       0x00010e73, 0xd7610000,
-       0x00011074, 0xd7610000,
-       0x00011275, 0xd7610000,
-       0x00011476, 0xd7610000,
-       0x00011677, 0xd7610000,
-       0x00011a79, 0xd7610000,
-       0x00011c7e, 0xd7610000,
-       0x00011e7f, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xbefe00ff,
-       0x00003fff, 0xbeff0080,
-       0xee0a407a, 0x000c0000,
-       0x00004000, 0xd760007a,
-       0x00011d00, 0xd760007b,
-       0x00011f00, 0xbefe007a,
-       0xbeff007b, 0xbef4007e,
-       0x8b75ff7f, 0x0000ffff,
-       0x8c75ff75, 0x00040000,
-       0xbef60080, 0xbef700ff,
-       0x10807fac, 0xbef1007d,
-       0xbef00080, 0xb8f30742,
-       0x84739973, 0xbefe00c1,
-       0x857d9973, 0x8b7d817d,
-       0xbf06817d, 0xbfa20002,
-       0xbeff0080, 0xbfa00002,
-       0xbeff00c1, 0xbfa0000c,
-       0xbef600ff, 0x01000000,
-       0xc4068070, 0x008ce801,
-       0x00008000, 0xc4068070,
-       0x008ce802, 0x00010000,
-       0xc4068070, 0x008ce803,
-       0x00018000, 0xbfa0000b,
-       0xbef600ff, 0x01000000,
-       0xc4068070, 0x008ce801,
-       0x00010000, 0xc4068070,
-       0x008ce802, 0x00020000,
-       0xc4068070, 0x008ce803,
-       0x00030000, 0xb8f03b05,
-       0x80708170, 0xbf0d9973,
-       0xbfa20002, 0x84708970,
-       0xbfa00001, 0x84708a70,
-       0xb8fa1e06, 0x847a8a7a,
-       0x80707a70, 0x8070ff70,
-       0x00000200, 0xbef600ff,
-       0x01000000, 0x7e000280,
-       0x7e020280, 0x7e040280,
-       0xbe804ec2, 0xbf94fffe,
-       0xb8faf804, 0x8b7a847a,
-       0x91788478, 0x8c787a78,
-       0x917aff6d, 0x80000000,
-       0xd7610002, 0x00010071,
-       0xd7610002, 0x0001026c,
-       0xd7610002, 0x0001047a,
-       0xd7610002, 0x0001066e,
-       0xd7610002, 0x0001086f,
-       0xd7610002, 0x00010a78,
-       0xd7610002, 0x00010e7b,
-       0xd8500000, 0x00000000,
-       0xd8500000, 0x00000000,
-       0xd8500000, 0x00000000,
-       0xd8500000, 0x00000000,
-       0xd8500000, 0x00000000,
-       0xd8500000, 0x00000000,
-       0xd8500000, 0x00000000,
-       0xd8500000, 0x00000000,
-       0xb8faf811, 0xd7610002,
-       0x00010c7a, 0xb8faf801,
-       0xd7610002, 0x0001107a,
-       0xb8faf814, 0xd7610002,
-       0x0001127a, 0xb8faf815,
-       0xd7610002, 0x0001147a,
-       0xb8faf812, 0xd7610002,
-       0x0001167a, 0xb8faf813,
-       0xd7610002, 0x0001187a,
-       0xb8faf802, 0xd7610002,
-       0x00011a7a, 0xbefa50c1,
-       0xbfc70000, 0xd7610002,
-       0x00011c7a, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xbefe00ff,
-       0x0000ffff, 0xbeff0080,
-       0xc4068070, 0x008ce802,
-       0x00000000, 0xbefe00c1,
+       0x8b7bff7f, 0x0000ffff,
+       0x807aff7a, 0x00000240,
+       0x807a7e7a, 0x827b807b,
+       0xd7610000, 0x00010870,
+       0xd7610000, 0x00010a71,
+       0xd7610000, 0x00010c72,
+       0xd7610000, 0x00010e73,
+       0xd7610000, 0x00011074,
+       0xd7610000, 0x00011275,
+       0xd7610000, 0x00011476,
+       0xd7610000, 0x00011677,
+       0xd7610000, 0x00011a79,
+       0xd7610000, 0x00011c7e,
+       0xd7610000, 0x00011e7f,
+       0xbefe00ff, 0x00003fff,
+       0xbeff0080, 0xee0a407a,
+       0x000c0000, 0x00000000,
+       0xd760007a, 0x00011d00,
+       0xd760007b, 0x00011f00,
+       0xbefe007a, 0xbeff007b,
+       0xbef4007e, 0x8b75ff7f,
+       0x0000ffff, 0xbef1007d,
+       0xb8f30742, 0x84739973,
+       0xbefe00c1, 0x857d9973,
+       0x8b7d817d, 0xbf06817d,
+       0xbfa20002, 0xbeff0080,
+       0xbfa00002, 0xbeff00c1,
+       0xbfa0000a, 0xee0a4074,
+       0x008c0000, 0x00008000,
+       0xee0a4074, 0x010c0000,
+       0x00010000, 0xee0a4074,
+       0x018c0000, 0x00018000,
+       0xbfa00009, 0xee0a4074,
+       0x008c0000, 0x00010000,
+       0xee0a4074, 0x010c0000,
+       0x00020000, 0xee0a4074,
+       0x018c0000, 0x00030000,
        0xb8f03b05, 0x80708170,
        0xbf0d9973, 0xbfa20002,
        0x84708970, 0xbfa00001,
-       0x84708a70, 0xb8fa1e06,
-       0x847a8a7a, 0x80707a70,
-       0xbef600ff, 0x01000000,
+       0x84708a70, 0x8070ff70,
+       0x00000200, 0x7e000280,
+       0x7e020280, 0x7e040280,
+       0xbefd0080, 0xbe804ec2,
+       0xbf94fffe, 0xb8faf804,
+       0x8b7a847a, 0x91788478,
+       0x8c787a78, 0xd7610002,
+       0x0000fa71, 0x807d817d,
+       0xd7610002, 0x0000fa6c,
+       0x807d817d, 0x917aff6d,
+       0x80000000, 0xd7610002,
+       0x0000fa7a, 0x807d817d,
+       0xd7610002, 0x0000fa6e,
+       0x807d817d, 0xd7610002,
+       0x0000fa6f, 0x807d817d,
+       0xd7610002, 0x0000fa78,
+       0x807d817d, 0xb8faf811,
+       0xd7610002, 0x0000fa7a,
+       0x807d817d, 0xbefa0080,
+       0xd7610002, 0x0000fa7a,
+       0x807d817d, 0xb8f1f801,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8f1f814,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8f1f815,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8f1f812,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8f1f813,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8faf802,
+       0xd7610002, 0x0000fa7a,
+       0x807d817d, 0xbefa50c1,
+       0xbfc70000, 0xd7610002,
+       0x0000fa7a, 0x807d817d,
+       0xbefe00ff, 0x0000ffff,
+       0xbeff0080, 0x80767074,
+       0x82778075, 0xee0a4076,
+       0x010c0000, 0x00000000,
+       0xbefe00c1, 0xb8f03b05,
+       0x80708170, 0xbf0d9973,
+       0xbfa20002, 0x84708970,
+       0xbfa00001, 0x84708a70,
        0xbef90080, 0xbefd0080,
        0xbf800000, 0xbe804100,
        0xbe824102, 0xbe844104,
        0xbe864106, 0xbe884108,
        0xbe8a410a, 0xbe8c410c,
-       0xbe8e410e, 0xbf068079,
-       0xbfa10032, 0xd7610002,
-       0x00010000, 0xd7610002,
-       0x00010201, 0xd7610002,
-       0x00010402, 0xd7610002,
-       0x00010603, 0xd7610002,
-       0x00010804, 0xd7610002,
-       0x00010a05, 0xd7610002,
-       0x00010c06, 0xd7610002,
-       0x00010e07, 0xd7610002,
-       0x00011008, 0xd7610002,
-       0x00011209, 0xd7610002,
-       0x0001140a, 0xd7610002,
-       0x0001160b, 0xd7610002,
-       0x0001180c, 0xd7610002,
-       0x00011a0d, 0xd7610002,
-       0x00011c0e, 0xd7610002,
-       0x00011e0f, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0x80799079,
-       0xbfa00038, 0xd7610002,
-       0x00012000, 0xd7610002,
-       0x00012201, 0xd7610002,
-       0x00012402, 0xd7610002,
-       0x00012603, 0xd7610002,
-       0x00012804, 0xd7610002,
-       0x00012a05, 0xd7610002,
-       0x00012c06, 0xd7610002,
-       0x00012e07, 0xd7610002,
-       0x00013008, 0xd7610002,
-       0x00013209, 0xd7610002,
-       0x0001340a, 0xd7610002,
-       0x0001360b, 0xd7610002,
-       0x0001380c, 0xd7610002,
-       0x00013a0d, 0xd7610002,
-       0x00013c0e, 0xd7610002,
-       0x00013e0f, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0x80799079,
-       0xc4068070, 0x008ce802,
-       0x00000000, 0x8070ff70,
-       0x00000080, 0xbef90080,
-       0x7e040280, 0x807d907d,
-       0xbf0aff7d, 0x00000060,
-       0xbfa2ff88, 0xbe804100,
-       0xbe824102, 0xbe844104,
-       0xbe864106, 0xbe884108,
-       0xbe8a410a, 0xd7610002,
-       0x00010000, 0xd7610002,
-       0x00010201, 0xd7610002,
-       0x00010402, 0xd7610002,
-       0x00010603, 0xd7610002,
-       0x00010804, 0xd7610002,
-       0x00010a05, 0xd7610002,
-       0x00010c06, 0xd7610002,
-       0x00010e07, 0xd7610002,
-       0x00011008, 0xd7610002,
-       0x00011209, 0xd7610002,
-       0x0001140a, 0xd7610002,
-       0x0001160b, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xd8500000,
-       0x00000000, 0xc4068070,
-       0x008ce802, 0x00000000,
-       0xbefe00c1, 0x857d9973,
-       0x8b7d817d, 0xbf06817d,
-       0xbfa20002, 0xbeff0080,
-       0xbfa00001, 0xbeff00c1,
-       0xb8fb4306, 0x8b7bc17b,
-       0xbfa10044, 0x8b7aff6d,
-       0x80000000, 0xbfa10041,
-       0x847b897b, 0xbef6007b,
+       0xbe8e410e, 0xd7610002,
+       0x0000f200, 0x80798179,
+       0xd7610002, 0x0000f201,
+       0x80798179, 0xd7610002,
+       0x0000f202, 0x80798179,
+       0xd7610002, 0x0000f203,
+       0x80798179, 0xd7610002,
+       0x0000f204, 0x80798179,
+       0xd7610002, 0x0000f205,
+       0x80798179, 0xd7610002,
+       0x0000f206, 0x80798179,
+       0xd7610002, 0x0000f207,
+       0x80798179, 0xd7610002,
+       0x0000f208, 0x80798179,
+       0xd7610002, 0x0000f209,
+       0x80798179, 0xd7610002,
+       0x0000f20a, 0x80798179,
+       0xd7610002, 0x0000f20b,
+       0x80798179, 0xd7610002,
+       0x0000f20c, 0x80798179,
+       0xd7610002, 0x0000f20d,
+       0x80798179, 0xd7610002,
+       0x0000f20e, 0x80798179,
+       0xd7610002, 0x0000f20f,
+       0x80798179, 0xbf06a079,
+       0xbfa10009, 0x80767074,
+       0x82778075, 0xee0a4076,
+       0x010c0000, 0x00000000,
+       0x8070ff70, 0x00000080,
+       0xbef90080, 0x7e040280,
+       0x807d907d, 0xbf0aff7d,
+       0x00000060, 0xbfa2ffb9,
+       0xbe804100, 0xbe824102,
+       0xbe844104, 0xbe864106,
+       0xbe884108, 0xbe8a410a,
+       0xd7610002, 0x0000f200,
+       0x80798179, 0xd7610002,
+       0x0000f201, 0x80798179,
+       0xd7610002, 0x0000f202,
+       0x80798179, 0xd7610002,
+       0x0000f203, 0x80798179,
+       0xd7610002, 0x0000f204,
+       0x80798179, 0xd7610002,
+       0x0000f205, 0x80798179,
+       0xd7610002, 0x0000f206,
+       0x80798179, 0xd7610002,
+       0x0000f207, 0x80798179,
+       0xd7610002, 0x0000f208,
+       0x80798179, 0xd7610002,
+       0x0000f209, 0x80798179,
+       0xd7610002, 0x0000f20a,
+       0x80798179, 0xd7610002,
+       0x0000f20b, 0x80798179,
+       0x80767074, 0x82778075,
+       0xee0a4076, 0x010c0000,
+       0x00000000, 0xbefe00c1,
+       0x857d9973, 0x8b7d817d,
+       0xbf06817d, 0xbfa20002,
+       0xbeff0080, 0xbfa00001,
+       0xbeff00c1, 0xb8fb4306,
+       0x8b7bc17b, 0xbfa10042,
+       0x8b7aff6d, 0x80000000,
+       0xbfa1003f, 0x847b897b,
        0xb8f03b05, 0x80708170,
        0xbf0d9973, 0xbfa20002,
        0x84708970, 0xbfa00001,
-       0x84708a70, 0xb8fa1e06,
-       0x847a8a7a, 0x80707a70,
-       0x8070ff70, 0x00000200,
-       0x8070ff70, 0x00000080,
-       0xbef600ff, 0x01000000,
-       0xd71f0000, 0x000100c1,
-       0xd7200000, 0x000200c1,
-       0x16000084, 0x857d9973,
-       0x8b7d817d, 0xbf06817d,
-       0xbefd0080, 0xbfa20013,
-       0xbe8300ff, 0x00000080,
+       0x84708a70, 0x8070ff70,
+       0x00000200, 0x8070ff70,
+       0x00000080, 0xd71f0000,
+       0x000100c1, 0xd7200000,
+       0x000200c1, 0x16000084,
+       0x857d9973, 0x8b7d817d,
+       0xbf06817d, 0xbefd0080,
+       0xbfa20015, 0xbe8300ff,
+       0x00000080, 0xbf800000,
+       0xbf800000, 0xbf800000,
+       0xd8d80000, 0x01000000,
+       0xbf8a0000, 0x80767074,
+       0x82778075, 0xee0a4076,
+       0x008c0000, 0x00000000,
+       0x807d037d, 0x80700370,
+       0xd5250000, 0x0001ff00,
+       0x00000080, 0xbf0a7b7d,
+       0xbfa2fff1, 0xbfa00014,
+       0xbe8300ff, 0x00000100,
        0xbf800000, 0xbf800000,
        0xbf800000, 0xd8d80000,
        0x01000000, 0xbf8a0000,
-       0xc4068070, 0x008ce801,
+       0x80767074, 0x82778075,
+       0xee0a4076, 0x008c0000,
        0x00000000, 0x807d037d,
        0x80700370, 0xd5250000,
-       0x0001ff00, 0x00000080,
-       0xbf0a7b7d, 0xbfa2fff3,
-       0xbfa00012, 0xbe8300ff,
-       0x00000100, 0xbf800000,
-       0xbf800000, 0xbf800000,
-       0xd8d80000, 0x01000000,
-       0xbf8a0000, 0xc4068070,
-       0x008ce801, 0x00000000,
-       0x807d037d, 0x80700370,
-       0xd5250000, 0x0001ff00,
-       0x00000100, 0xbf0a7b7d,
-       0xbfa2fff3, 0xbefe00c1,
-       0x857d9973, 0x8b7d817d,
-       0xbf06817d, 0xbfa20004,
-       0xbef000ff, 0x00000200,
-       0xbeff0080, 0xbfa00003,
-       0xbef000ff, 0x00000400,
-       0xbeff00c1, 0xb8fb3b05,
-       0x807b817b, 0x847b827b,
-       0x857d9973, 0x8b7d817d,
-       0xbf06817d, 0xbfa2001b,
-       0xbef600ff, 0x01000000,
-       0xbefd0084, 0xbf0a7b7d,
-       0xbfa10040, 0x7e008700,
-       0x7e028701, 0x7e048702,
-       0x7e068703, 0xc4068070,
-       0x008ce800, 0x00000000,
-       0xc4068070, 0x008ce801,
-       0x00008000, 0xc4068070,
-       0x008ce802, 0x00010000,
-       0xc4068070, 0x008ce803,
-       0x00018000, 0x807d847d,
-       0x8070ff70, 0x00000200,
-       0xbf0a7b7d, 0xbfa2ffeb,
-       0xbfa0002a, 0xbef600ff,
-       0x01000000, 0xbefd0084,
-       0xbf0a7b7d, 0xbfa10015,
+       0x0001ff00, 0x00000100,
+       0xbf0a7b7d, 0xbfa2fff1,
+       0xbefe00c1, 0x857d9973,
+       0x8b7d817d, 0xbf06817d,
+       0xbfa20004, 0xbef000ff,
+       0x00000200, 0xbeff0080,
+       0xbfa00003, 0xbef000ff,
+       0x00000400, 0xbeff00c1,
+       0xb8fb3b05, 0x807b817b,
+       0x847b827b, 0x857d9973,
+       0x8b7d817d, 0xbf06817d,
+       0xbfa2001b, 0xbefd0084,
+       0xbf0a7b7d, 0xbfa10032,
        0x7e008700, 0x7e028701,
        0x7e048702, 0x7e068703,
-       0xc4068070, 0x008ce800,
-       0x00000000, 0xc4068070,
-       0x008ce801, 0x00010000,
-       0xc4068070, 0x008ce802,
-       0x00020000, 0xc4068070,
-       0x008ce803, 0x00030000,
+       0x80767074, 0x82778075,
+       0xee0a4076, 0x000c0000,
+       0x00000000, 0xee0a4076,
+       0x008c0000, 0x00008000,
+       0xee0a4076, 0x010c0000,
+       0x00010000, 0xee0a4076,
+       0x018c0000, 0x00018000,
        0x807d847d, 0x8070ff70,
-       0x00000400, 0xbf0a7b7d,
-       0xbfa2ffeb, 0xb8fb1e06,
-       0x8b7bc17b, 0xbfa1000d,
-       0x847b837b, 0x807b7d7b,
-       0xbefe00c1, 0xbeff0080,
-       0x7e008700, 0xc4068070,
-       0x008ce800, 0x00000000,
-       0x807d817d, 0x8070ff70,
-       0x00000080, 0xbf0a7b7d,
-       0xbfa2fff7, 0xbfa00171,
-       0xbef4007e, 0x8b75ff7f,
-       0x0000ffff, 0x8c75ff75,
-       0x00040000, 0xbef60080,
-       0xbef700ff, 0x10807fac,
+       0x00000200, 0xbf0a7b7d,
+       0xbfa2ffe9, 0xbfa0001a,
+       0xbefd0084, 0xbf0a7b7d,
+       0xbfa10017, 0x7e008700,
+       0x7e028701, 0x7e048702,
+       0x7e068703, 0x80767074,
+       0x82778075, 0xee0a4076,
+       0x000c0000, 0x00000000,
+       0xee0a4076, 0x008c0000,
+       0x00010000, 0xee0a4076,
+       0x010c0000, 0x00020000,
+       0xee0a4076, 0x018c0000,
+       0x00030000, 0x807d847d,
+       0x8070ff70, 0x00000400,
+       0xbf0a7b7d, 0xbfa2ffe9,
+       0xbfa0014c, 0xbef4007e,
+       0x8b75ff7f, 0x0000ffff,
        0xbef1007f, 0xb8f20742,
        0x84729972, 0x8b6eff7f,
-       0x04000000, 0xbfa1003b,
-       0xbefe00c1, 0x857d9972,
-       0x8b7d817d, 0xbf06817d,
-       0xbfa20002, 0xbeff0080,
-       0xbfa00001, 0xbeff00c1,
-       0xb8ef4306, 0x8b6fc16f,
-       0xbfa10030, 0x846f896f,
-       0xbef6006f, 0xb8f83b05,
-       0x80788178, 0xbf0d9972,
-       0xbfa20002, 0x84788978,
-       0xbfa00001, 0x84788a78,
-       0xb8ee1e06, 0x846e8a6e,
-       0x80786e78, 0x8078ff78,
-       0x00000200, 0x8078ff78,
-       0x00000080, 0xbef600ff,
-       0x01000000, 0x857d9972,
-       0x8b7d817d, 0xbf06817d,
-       0xbefd0080, 0xbfa2000d,
-       0xc4050078, 0x0080e800,
-       0x00000000, 0xbf8a0000,
-       0xdac00000, 0x00000000,
-       0x807dff7d, 0x00000080,
-       0x8078ff78, 0x00000080,
-       0xbf0a6f7d, 0xbfa2fff4,
-       0xbfa0000c, 0xc4050078,
-       0x0080e800, 0x00000000,
-       0xbf8a0000, 0xdac00000,
-       0x00000000, 0x807dff7d,
-       0x00000100, 0x8078ff78,
-       0x00000100, 0xbf0a6f7d,
-       0xbfa2fff4, 0xbef80080,
+       0x04000000, 0xbfa10044,
        0xbefe00c1, 0x857d9972,
        0x8b7d817d, 0xbf06817d,
-       0xbfa20002, 0xbeff0080,
-       0xbfa00001, 0xbeff00c1,
-       0xb8ef3b05, 0x806f816f,
-       0x846f826f, 0x857d9972,
-       0x8b7d817d, 0xbf06817d,
-       0xbfa2002c, 0xbef600ff,
-       0x01000000, 0xbeee0078,
-       0x8078ff78, 0x00000200,
-       0xbefd0084, 0xbf0a6f7d,
-       0xbfa10061, 0xc4050078,
-       0x008ce800, 0x00000000,
-       0xc4050078, 0x008ce801,
-       0x00008000, 0xc4050078,
-       0x008ce802, 0x00010000,
-       0xc4050078, 0x008ce803,
-       0x00018000, 0xbf8a0000,
-       0x7e008500, 0x7e028501,
-       0x7e048502, 0x7e068503,
-       0x807d847d, 0x8078ff78,
-       0x00000200, 0xbf0a6f7d,
-       0xbfa2ffea, 0xc405006e,
-       0x008ce800, 0x00000000,
-       0xc405006e, 0x008ce801,
-       0x00008000, 0xc405006e,
-       0x008ce802, 0x00010000,
-       0xc405006e, 0x008ce803,
-       0x00018000, 0xbf8a0000,
-       0xbfa0003d, 0xbef600ff,
-       0x01000000, 0xbeee0078,
-       0x8078ff78, 0x00000400,
-       0xbefd0084, 0xbf0a6f7d,
-       0xbfa10016, 0xc4050078,
-       0x008ce800, 0x00000000,
-       0xc4050078, 0x008ce801,
-       0x00010000, 0xc4050078,
-       0x008ce802, 0x00020000,
-       0xc4050078, 0x008ce803,
-       0x00030000, 0xbf8a0000,
-       0x7e008500, 0x7e028501,
-       0x7e048502, 0x7e068503,
-       0x807d847d, 0x8078ff78,
-       0x00000400, 0xbf0a6f7d,
-       0xbfa2ffea, 0xb8ef1e06,
-       0x8b6fc16f, 0xbfa1000f,
-       0x846f836f, 0x806f7d6f,
-       0xbefe00c1, 0xbeff0080,
-       0xc4050078, 0x008ce800,
-       0x00000000, 0xbf8a0000,
-       0x7e008500, 0x807d817d,
-       0x8078ff78, 0x00000080,
-       0xbf0a6f7d, 0xbfa2fff6,
-       0xbeff00c1, 0xc405006e,
-       0x008ce800, 0x00000000,
-       0xc405006e, 0x008ce801,
-       0x00010000, 0xc405006e,
-       0x008ce802, 0x00020000,
-       0xc405006e, 0x008ce803,
-       0x00030000, 0xbf8a0000,
+       0xbfa20002, 0xbeff0080,
+       0xbfa00001, 0xbeff00c1,
+       0xb8ef4306, 0x8b6fc16f,
+       0xbfa10039, 0x846f896f,
        0xb8f83b05, 0x80788178,
        0xbf0d9972, 0xbfa20002,
        0x84788978, 0xbfa00001,
-       0x84788a78, 0xb8ee1e06,
-       0x846e8a6e, 0x80786e78,
+       0x84788a78, 0x8078ff78,
+       0x00000200, 0x8078ff78,
+       0x00000080, 0x857d9972,
+       0x8b7d817d, 0xbf06817d,
+       0xbefd0080, 0xd71f0001,
+       0x000100c1, 0xd7200001,
+       0x000202c1, 0x30020282,
+       0xbfa20012, 0x80767874,
+       0x82778075, 0xee0a0076,
+       0x000c0000, 0x00000000,
+       0xbf8a0000, 0xd8340000,
+       0x00000001, 0xd5250001,
+       0x0001ff01, 0x00000080,
+       0x807dff7d, 0x00000080,
+       0x8078ff78, 0x00000080,
+       0xbf0a6f7d, 0xbfa2ffef,
+       0xbfa00011, 0x80767874,
+       0x82778075, 0xee0a0076,
+       0x000c0000, 0x00000000,
+       0xbf8a0000, 0xd8340000,
+       0x00000001, 0xd5250001,
+       0x0001ff01, 0x00000100,
+       0x807dff7d, 0x00000100,
+       0x8078ff78, 0x00000100,
+       0xbf0a6f7d, 0xbfa2ffef,
+       0xbef80080, 0xbefe00c1,
+       0x857d9972, 0x8b7d817d,
+       0xbf06817d, 0xbfa20002,
+       0xbeff0080, 0xbfa00001,
+       0xbeff00c1, 0xb8ef3b05,
+       0x806f816f, 0x846f826f,
+       0x857d9972, 0x8b7d817d,
+       0xbf06817d, 0xbfa2002c,
+       0xbeee0078, 0x8078ff78,
+       0x00000200, 0xbefd0084,
+       0x80767874, 0x82778075,
+       0xee0a0076, 0x000c0000,
+       0x00000000, 0xee0a0076,
+       0x000c0001, 0x00008000,
+       0xee0a0076, 0x000c0002,
+       0x00010000, 0xee0a0076,
+       0x000c0003, 0x00018000,
+       0xbf8a0000, 0x7e008500,
+       0x7e028501, 0x7e048502,
+       0x7e068503, 0x807d847d,
        0x8078ff78, 0x00000200,
-       0x80f8ff78, 0x00000050,
-       0xbef600ff, 0x01000000,
+       0xbf0a6f7d, 0xbfa2ffe8,
+       0x80766e74, 0x82778075,
+       0xee0a0076, 0x000c0000,
+       0x00000000, 0xee0a0076,
+       0x000c0001, 0x00008000,
+       0xee0a0076, 0x000c0002,
+       0x00010000, 0xee0a0076,
+       0x000c0003, 0x00018000,
+       0xbf8a0000, 0xbfa0002d,
+       0xbeee0078, 0x8078ff78,
+       0x00000400, 0xbefd0084,
+       0xbf0a6f7d, 0xbfa10018,
+       0x80767874, 0x82778075,
+       0xee0a0076, 0x000c0000,
+       0x00000000, 0xee0a0076,
+       0x000c0001, 0x00010000,
+       0xee0a0076, 0x000c0002,
+       0x00020000, 0xee0a0076,
+       0x000c0003, 0x00030000,
+       0xbf8a0000, 0x7e008500,
+       0x7e028501, 0x7e048502,
+       0x7e068503, 0x807d847d,
+       0x8078ff78, 0x00000400,
+       0xbf0a6f7d, 0xbfa2ffe8,
+       0x80766e74, 0x82778075,
+       0xee0a0076, 0x000c0000,
+       0x00000000, 0xee0a0076,
+       0x000c0001, 0x00010000,
+       0xee0a0076, 0x000c0002,
+       0x00020000, 0xee0a0076,
+       0x000c0003, 0x00030000,
+       0xbf8a0000, 0xb8f83b05,
+       0x80788178, 0xbf0d9972,
+       0xbfa20002, 0x84788978,
+       0xbfa00001, 0x84788a78,
+       0x8078ff78, 0x00000200,
+       0x80f8ff78, 0x00000060,
+       0x80767874, 0x82778075,
        0xbefd00ff, 0x0000006c,
-       0x80f89078, 0xf462403a,
-       0xf0000000, 0xbf8a0000,
-       0x80fd847d, 0xbf800000,
-       0xbe804300, 0xbe824302,
-       0x80f8a078, 0xf462603a,
-       0xf0000000, 0xbf8a0000,
+       0xf460403b, 0xf8000000,
+       0xbf8a0000, 0x80fd847d,
+       0xbf800000, 0xbe804300,
+       0xbe824302, 0x80f6a076,
+       0x82f78077, 0xf460603b,
+       0xf8000000, 0xbf8a0000,
        0x80fd887d, 0xbf800000,
        0xbe804300, 0xbe824302,
        0xbe844304, 0xbe864306,
-       0x80f8c078, 0xf462803a,
-       0xf0000000, 0xbf8a0000,
-       0x80fd907d, 0xbf800000,
-       0xbe804300, 0xbe824302,
-       0xbe844304, 0xbe864306,
-       0xbe884308, 0xbe8a430a,
-       0xbe8c430c, 0xbe8e430e,
-       0xbf06807d, 0xbfa1fff0,
-       0xb980f801, 0x00000000,
-       0xb8f83b05, 0x80788178,
-       0xbf0d9972, 0xbfa20002,
-       0x84788978, 0xbfa00001,
-       0x84788a78, 0xb8ee1e06,
-       0x846e8a6e, 0x80786e78,
+       0x80f6c076, 0x82f78077,
+       0xf460803b, 0xf8000000,
+       0xbf8a0000, 0x80fd907d,
+       0xbf800000, 0xbe804300,
+       0xbe824302, 0xbe844304,
+       0xbe864306, 0xbe884308,
+       0xbe8a430a, 0xbe8c430c,
+       0xbe8e430e, 0xbf06807d,
+       0xbfa1ffef, 0xb980f801,
+       0x00000000, 0xb8f83b05,
+       0x80788178, 0xbf0d9972,
+       0xbfa20002, 0x84788978,
+       0xbfa00001, 0x84788a78,
        0x8078ff78, 0x00000200,
-       0xbef600ff, 0x01000000,
-       0xbeff0071, 0xf4621bfa,
-       0xf0000000, 0x80788478,
-       0xf4621b3a, 0xf0000000,
-       0x80788478, 0xf4621b7a,
-       0xf0000000, 0x80788478,
-       0xf4621c3a, 0xf0000000,
-       0x80788478, 0xf4621c7a,
-       0xf0000000, 0x80788478,
-       0xf4621eba, 0xf0000000,
-       0x80788478, 0xf4621efa,
-       0xf0000000, 0x80788478,
-       0xf4621e7a, 0xf0000000,
-       0x80788478, 0xf4621cfa,
-       0xf0000000, 0x80788478,
-       0xf4621bba, 0xf0000000,
-       0x80788478, 0xbf8a0000,
-       0xb96ef814, 0xf4621bba,
-       0xf0000000, 0x80788478,
-       0xbf8a0000, 0xb96ef815,
-       0xf4621bba, 0xf0000000,
-       0x80788478, 0xbf8a0000,
-       0xb96ef812, 0xf4621bba,
-       0xf0000000, 0x80788478,
-       0xbf8a0000, 0xb96ef813,
-       0x8b6eff7f, 0x04000000,
-       0xbfa1000d, 0x80788478,
-       0xf4621bba, 0xf0000000,
-       0x80788478, 0xbf8a0000,
-       0xbf0d806e, 0xbfa10006,
-       0x856e906e, 0x8b6e6e6e,
-       0xbfa10003, 0xbe804ec1,
-       0x816ec16e, 0xbfa0fffb,
-       0xbefd006f, 0xbefe0070,
-       0xbeff0071, 0xb97b2011,
-       0x857b867b, 0xb97b0191,
-       0x857b827b, 0xb97bba11,
-       0xb973f801, 0xb8ee3b05,
-       0x806e816e, 0xbf0d9972,
-       0xbfa20002, 0x846e896e,
-       0xbfa00001, 0x846e8a6e,
-       0xb8ef1e06, 0x846f8a6f,
-       0x806e6f6e, 0x806eff6e,
-       0x00000200, 0x806e746e,
-       0x826f8075, 0x8b6fff6f,
-       0x0000ffff, 0xf4605c37,
-       0xf8000050, 0xf4605d37,
-       0xf8000060, 0xf4601e77,
-       0xf8000074, 0xbf8a0000,
+       0x80767874, 0x82778075,
+       0xbeff0071, 0xf4601bfb,
+       0xf8000000, 0xf4601b3b,
+       0xf8000004, 0xf4601b7b,
+       0xf8000008, 0xf4601c3b,
+       0xf800000c, 0xf4601c7b,
+       0xf8000010, 0xf4601ebb,
+       0xf8000014, 0xf4601efb,
+       0xf8000018, 0xf4601e7b,
+       0xf800001c, 0xf4601cfb,
+       0xf8000020, 0xf4601bbb,
+       0xf8000024, 0xbf8a0000,
+       0xb96ef814, 0xf4601bbb,
+       0xf8000028, 0xbf8a0000,
+       0xb96ef815, 0xf4601bbb,
+       0xf800002c, 0xbf8a0000,
+       0xb96ef812, 0xf4601bbb,
+       0xf8000030, 0xbf8a0000,
+       0xb96ef813, 0x8b6eff7f,
+       0x04000000, 0xbfa1000b,
+       0xf4601bbb, 0xf8000038,
+       0xbf8a0000, 0xbf0d806e,
+       0xbfa10006, 0x856e906e,
+       0x8b6e6e6e, 0xbfa10003,
+       0xbe804ec1, 0x816ec16e,
+       0xbfa0fffb, 0xbefd006f,
+       0xbefe0070, 0xbeff0071,
+       0xb97b2011, 0x857b867b,
+       0xb97b0191, 0x857b827b,
+       0xb97bba11, 0xb973f801,
+       0xb8ee3b05, 0x806e816e,
+       0xbf0d9972, 0xbfa20002,
+       0x846e896e, 0xbfa00001,
+       0x846e8a6e, 0x806eff6e,
+       0x00000240, 0x806e746e,
+       0x826f8075, 0xf4605c37,
+       0xf8000010, 0xf4605d37,
+       0xf8000020, 0xf4601e77,
+       0xf8000034, 0xbf8a0000,
        0x8b6dff6d, 0x0000ffff,
        0x8bfe7e7e, 0x8bea6a6a,
        0x936eff77, 0x0002001a,
@@ -4666,14 +4587,18 @@ static const uint32_t cwsr_trap_gfx9_5_0_hex[] = {
 };
 
 static const uint32_t cwsr_trap_gfx12_1_0_hex[] = {
-       0xbfa00001, 0xbfa003b7,
-       0xb0804009, 0xb8f8f804,
+       0xbfa00001, 0xbfa003aa,
+       0xb0804009, 0xb8eef81a,
+       0xbf880000, 0xb980081a,
+       0x00000000, 0xb8f8f804,
+       0x9177ff77, 0x0c000000,
+       0x846e9a6e, 0x8c776e77,
        0x9178ff78, 0x00008c00,
        0xb8fbf811, 0x8b6eff78,
        0x00004000, 0xbfa10008,
        0x8b6eff7b, 0x00000080,
        0xbfa20018, 0x8b6ea07b,
-       0xbfa200e1, 0xbf830010,
+       0xbfa200d4, 0xbf830010,
        0xb8fbf811, 0xbfa0fffb,
        0x8b6eff7b, 0x00000bd0,
        0xbfa20010, 0xb8eef812,
@@ -4684,7 +4609,7 @@ static const uint32_t cwsr_trap_gfx12_1_0_hex[] = {
        0xf0000000, 0xbfa20005,
        0x8b6fff6f, 0x00000200,
        0xbfa20002, 0x8b6ea07b,
-       0xbfa200cb, 0x9177ff77,
+       0xbfa200be, 0x9177ff77,
        0x007fc000, 0xb8fa04a1,
        0x847a967a, 0x8c777a77,
        0xb8fa0421, 0x847a957a,
@@ -4777,263 +4702,230 @@ static const uint32_t cwsr_trap_gfx12_1_0_hex[] = {
        0xb97a0421, 0x857a8e77,
        0xb97a3021, 0x8bfe7e7e,
        0x8bea6a6a, 0x85788978,
-       0xb9783244, 0xbe804a6c,
-       0xb8faf802, 0xbf0d987a,
-       0xbfa10001, 0xbfb00000,
-       0x8b6dff6d, 0x01ffffff,
-       0xbefa0080, 0xb97a0151,
-       0x9177ff77, 0x007fc000,
-       0xb8fa04a1, 0x847a967a,
-       0x8c777a77, 0xb8fa0421,
-       0x847a957a, 0x8c777a77,
-       0xb8fa3021, 0x847a8e7a,
-       0x8c777a77, 0xb980f821,
-       0x00000000, 0xbf0d847b,
-       0xbfa20078, 0xf4003eb6,
-       0xf8000000, 0xf4003bb6,
-       0xf8000008, 0xbfc70001,
-       0x8b76ff7a, 0x80000000,
-       0xbfa20027, 0x9376ff7a,
-       0x00060019, 0x81f9a376,
-       0xbf0b8179, 0xbfa20068,
-       0x81f9ac76, 0xbf0b8179,
-       0xbfa20062, 0x81f9b776,
-       0xbf0b8179, 0xbfa2005f,
-       0x8b76ff7a, 0x000001ff,
-       0xbf06ff76, 0x000000fe,
-       0xbfa2005d, 0xbf06ff76,
-       0x000000ff, 0xbfa20057,
-       0xbf06ff76, 0x000000fa,
-       0xbfa20054, 0x81f9ff76,
-       0x000000e9, 0xbf0b8179,
-       0xbfa20050, 0x8b76ff7b,
-       0xffff0000, 0xbf06ff76,
-       0xbf860000, 0xbfa10051,
-       0x9376ff7b, 0x0002000e,
-       0x8b79ff7b, 0x00003f00,
-       0x85798679, 0x8c767976,
-       0xb9763b01, 0xbfa00049,
-       0x8b76ff7a, 0xfc000000,
-       0xbf06ff76, 0xd4000000,
-       0xbfa20013, 0xbf06ff76,
-       0xc8000000, 0xbfa20027,
-       0x8b76ff7a, 0xff000000,
-       0xbf06ff76, 0xcf000000,
-       0xbfa20039, 0x8b79ff7a,
-       0xffff0000, 0xbf06ff79,
-       0xcc350000, 0xbfa20037,
-       0xbf06ff79, 0xcc3a0000,
-       0xbfa20034, 0xbf06ff76,
-       0xcc000000, 0xbfa10031,
-       0x8b76ff7b, 0x000001ff,
+       0x936eff77, 0x0002001a,
+       0xb96ef81a, 0xb9783244,
+       0xbe804a6c, 0xb8faf802,
+       0xbf0d987a, 0xbfa10001,
+       0xbfb00000, 0x8b6dff6d,
+       0x01ffffff, 0xbefa0080,
+       0xb97a0151, 0x9177ff77,
+       0x007fc000, 0xb8fa04a1,
+       0x847a967a, 0x8c777a77,
+       0xb8fa0421, 0x847a957a,
+       0x8c777a77, 0xb8fa3021,
+       0x847a8e7a, 0x8c777a77,
+       0xb980f821, 0x00000000,
+       0xbf0d847b, 0xbfa20078,
+       0xf4003eb6, 0xf8000000,
+       0xf4003bb6, 0xf8000008,
+       0xbfc70001, 0x8b76ff7a,
+       0x80000000, 0xbfa20027,
+       0x9376ff7a, 0x00060019,
+       0x81f9a376, 0xbf0b8179,
+       0xbfa20068, 0x81f9ac76,
+       0xbf0b8179, 0xbfa20062,
+       0x81f9b776, 0xbf0b8179,
+       0xbfa2005f, 0x8b76ff7a,
+       0x000001ff, 0xbf06ff76,
+       0x000000fe, 0xbfa2005d,
        0xbf06ff76, 0x000000ff,
-       0xbfa20029, 0xbf06ff76,
-       0x000000fa, 0xbfa20026,
-       0x81f6ff76, 0x000000e9,
-       0xbf0b8176, 0xbfa20022,
-       0x8b76ff7b, 0x0003fe00,
-       0xbf06ff76, 0x0001fe00,
-       0xbfa2001d, 0x8b76ff7b,
-       0x07fc0000, 0xbf06ff76,
-       0x03fc0000, 0xbfa20018,
-       0xbfa00014, 0x9376ff7a,
-       0x00040016, 0x81f68176,
-       0xbf0b8176, 0xbfa20012,
-       0x9376ff7a, 0x00050011,
-       0x81f68176, 0xbf0b8176,
-       0xbfa2000d, 0x8b76ff7a,
+       0xbfa20057, 0xbf06ff76,
+       0x000000fa, 0xbfa20054,
+       0x81f9ff76, 0x000000e9,
+       0xbf0b8179, 0xbfa20050,
+       0x8b76ff7b, 0xffff0000,
+       0xbf06ff76, 0xbf860000,
+       0xbfa10051, 0x9376ff7b,
+       0x0002000e, 0x8b79ff7b,
+       0x00003f00, 0x85798679,
+       0x8c767976, 0xb9763b01,
+       0xbfa00049, 0x8b76ff7a,
+       0xfc000000, 0xbf06ff76,
+       0xd4000000, 0xbfa20013,
+       0xbf06ff76, 0xc8000000,
+       0xbfa20027, 0x8b76ff7a,
+       0xff000000, 0xbf06ff76,
+       0xcf000000, 0xbfa20039,
+       0x8b79ff7a, 0xffff0000,
+       0xbf06ff79, 0xcc350000,
+       0xbfa20037, 0xbf06ff79,
+       0xcc3a0000, 0xbfa20034,
+       0xbf06ff76, 0xcc000000,
+       0xbfa10031, 0x8b76ff7b,
        0x000001ff, 0xbf06ff76,
-       0x000000ff, 0xbfa20008,
-       0x8b76ff7b, 0x000001ff,
+       0x000000ff, 0xbfa20029,
+       0xbf06ff76, 0x000000fa,
+       0xbfa20026, 0x81f6ff76,
+       0x000000e9, 0xbf0b8176,
+       0xbfa20022, 0x8b76ff7b,
+       0x0003fe00, 0xbf06ff76,
+       0x0001fe00, 0xbfa2001d,
+       0x8b76ff7b, 0x07fc0000,
+       0xbf06ff76, 0x03fc0000,
+       0xbfa20018, 0xbfa00014,
+       0x9376ff7a, 0x00040016,
+       0x81f68176, 0xbf0b8176,
+       0xbfa20012, 0x9376ff7a,
+       0x00050011, 0x81f68176,
+       0xbf0b8176, 0xbfa2000d,
+       0x8b76ff7a, 0x000001ff,
        0xbf06ff76, 0x000000ff,
-       0xbfa20003, 0xbfc70000,
-       0xbefb006e, 0xbfa0ffad,
-       0xbfc70000, 0xbefb006f,
-       0xbfa0ffaa, 0xbfc70000,
-       0xbeee007e, 0xbeef007f,
-       0xbefe0180, 0xbefe4d84,
-       0xbf8a0000, 0x8b7aff7f,
-       0x04000000, 0x847a857a,
-       0x8c6d7a6d, 0xb8eff822,
-       0xb980f822, 0x00000000,
-       0xb8fa2b01, 0x847a997a,
-       0x8c6d7a6d, 0xbefa0080,
-       0xb97a2b01, 0xbefa007e,
+       0xbfa20008, 0x8b76ff7b,
+       0x000001ff, 0xbf06ff76,
+       0x000000ff, 0xbfa20003,
+       0xbfc70000, 0xbefb006e,
+       0xbfa0ffad, 0xbfc70000,
+       0xbefb006f, 0xbfa0ffaa,
+       0xbfc70000, 0xbeee007e,
+       0xbeef007f, 0xbefe0180,
+       0xbefe4d84, 0xbf8a0000,
+       0x8b7aff7f, 0x04000000,
+       0x847a857a, 0x8c6d7a6d,
+       0xb8eff822, 0xb980f822,
+       0x00000000, 0xb8fa2b01,
+       0x847a997a, 0x8c6d7a6d,
+       0xbefa0080, 0xb97a2b01,
+       0xbefa007e, 0x8b7bff7f,
+       0x01ffffff, 0xbefe00c1,
+       0xbeff00c1, 0xee0a407a,
+       0x000c0000, 0x00000000,
+       0x7e000280, 0xbefe007a,
+       0xbeff007b, 0xb8fb0742,
+       0x847b997b, 0xb8fa3b05,
+       0x807a817a, 0xbf0d997b,
+       0xbfa20002, 0x847a897a,
+       0xbfa00001, 0x847a8a7a,
        0x8b7bff7f, 0x01ffffff,
-       0xbefe00c1, 0xbeff00c1,
-       0xee0a407a, 0x000c0000,
-       0x00000000, 0x7e000280,
+       0x807aff7a, 0x000001c0,
+       0x807a7e7a, 0x827b807b,
+       0xd7610000, 0x00010870,
+       0xd7610000, 0x00010a71,
+       0xd7610000, 0x00010c72,
+       0xd7610000, 0x00010e73,
+       0xd7610000, 0x00011074,
+       0xd7610000, 0x00011275,
+       0xd7610000, 0x00011476,
+       0xd7610000, 0x00011677,
+       0xd7610000, 0x00011a79,
+       0xd7610000, 0x00011c7e,
+       0xd7610000, 0x00011e7f,
+       0xbefe00ff, 0x00003fff,
+       0xbeff0080, 0xee0a407a,
+       0x000c0000, 0x00000000,
+       0xd760007a, 0x00011d00,
+       0xd760007b, 0x00011f00,
        0xbefe007a, 0xbeff007b,
-       0xb8fb0742, 0x847b997b,
-       0xb8fa3b05, 0x807a817a,
-       0xbf0d997b, 0xbfa20002,
-       0x847a897a, 0xbfa00001,
-       0x847a8a7a, 0x8b7bff7f,
-       0x01ffffff, 0x807aff7a,
-       0x000001c0, 0x807a7e7a,
-       0x827b807b, 0xd7610000,
-       0x00010870, 0xd7610000,
-       0x00010a71, 0xd7610000,
-       0x00010c72, 0xd7610000,
-       0x00010e73, 0xd7610000,
-       0x00011074, 0xd7610000,
-       0x00011275, 0xd7610000,
-       0x00011476, 0xd7610000,
-       0x00011677, 0xd7610000,
-       0x00011a79, 0xd7610000,
-       0x00011c7e, 0xd7610000,
-       0x00011e7f, 0xbefe00ff,
-       0x00003fff, 0xbeff0080,
-       0xee0a407a, 0x000c0000,
-       0x00000000, 0xd760007a,
-       0x00011d00, 0xd760007b,
-       0x00011f00, 0xbefe007a,
-       0xbeff007b, 0xbef4007e,
-       0x8b75ff7f, 0x01ffffff,
-       0xbef1007d, 0xb8f30742,
-       0x84739973, 0xbefe00c1,
-       0x857d9973, 0x8b7d817d,
-       0xbf06817d, 0xbfa20002,
-       0xbeff0080, 0xbfa00002,
-       0xbeff00c1, 0xbfa0000a,
-       0xee0a4074, 0x008c0000,
-       0x00008000, 0xee0a4074,
-       0x010c0000, 0x00010000,
-       0xee0a4074, 0x018c0000,
-       0x00018000, 0xbfa00009,
-       0xee0a4074, 0x008c0000,
+       0xbef4007e, 0x8b75ff7f,
+       0x01ffffff, 0xbef1007d,
+       0xb8f30742, 0x84739973,
+       0xbefe00c1, 0x857d9973,
+       0x8b7d817d, 0xbf06817d,
+       0xbfa20002, 0xbeff0080,
+       0xbfa00002, 0xbeff00c1,
+       0xbfa0000a, 0xee0a4074,
+       0x008c0000, 0x00008000,
+       0xee0a4074, 0x010c0000,
        0x00010000, 0xee0a4074,
-       0x010c0000, 0x00020000,
-       0xee0a4074, 0x018c0000,
-       0x00030000, 0xb8f03b05,
-       0x80708170, 0xbf0d9973,
-       0xbfa20002, 0x84708970,
-       0xbfa00001, 0x84708a70,
-       0x8070ff70, 0x00000200,
-       0x7e000280, 0x7e020280,
-       0x7e040280, 0xbefd0080,
-       0xb8faf802, 0xbf0c8b7a,
-       0xbfa20003, 0xbe804fc2,
-       0xbf94fffe, 0xbfa10001,
-       0xbe804ec4, 0xbf94fffc,
-       0xb8faf804, 0x8b7aff7a,
-       0x0001000c, 0x9178ff78,
-       0x0001000c, 0x8c787a78,
-       0xd7610002, 0x0000fa71,
-       0x807d817d, 0xd7610002,
-       0x0000fa6c, 0x807d817d,
-       0x917aff6d, 0x80000000,
-       0xd7610002, 0x0000fa7a,
-       0x807d817d, 0xd7610002,
-       0x0000fa6e, 0x807d817d,
-       0xbefa0080, 0xd7610002,
+       0x018c0000, 0x00018000,
+       0xbfa00009, 0xee0a4074,
+       0x008c0000, 0x00010000,
+       0xee0a4074, 0x010c0000,
+       0x00020000, 0xee0a4074,
+       0x018c0000, 0x00030000,
+       0xb8f03b05, 0x80708170,
+       0xbf0d9973, 0xbfa20002,
+       0x84708970, 0xbfa00001,
+       0x84708a70, 0x8070ff70,
+       0x00000200, 0x7e000280,
+       0x7e020280, 0x7e040280,
+       0xbefd0080, 0xb8faf802,
+       0xbf0c8b7a, 0xbfa20003,
+       0xbe804fc2, 0xbf94fffe,
+       0xbfa10001, 0xbe804ec4,
+       0xbf94fffc, 0xb8faf804,
+       0x8b7aff7a, 0x0001000c,
+       0x9178ff78, 0x0001000c,
+       0x8c787a78, 0xd7610002,
+       0x0000fa71, 0x807d817d,
+       0xd7610002, 0x0000fa6c,
+       0x807d817d, 0x917aff6d,
+       0x80000000, 0xd7610002,
        0x0000fa7a, 0x807d817d,
-       0xd7610002, 0x0000fa78,
-       0x807d817d, 0xb8faf811,
+       0xd7610002, 0x0000fa6e,
+       0x807d817d, 0xbefa0080,
        0xd7610002, 0x0000fa7a,
        0x807d817d, 0xd7610002,
-       0x0000fa6f, 0x807d817d,
-       0xb8f1f801, 0x937aff6d,
-       0x00060019, 0x847a8c7a,
-       0x8c717a71, 0xd7610002,
-       0x0000fa71, 0x807d817d,
-       0xb8f1f814, 0xd7610002,
-       0x0000fa71, 0x807d817d,
-       0xb8f1f815, 0xd7610002,
-       0x0000fa71, 0x807d817d,
-       0xb8f1f812, 0xd7610002,
-       0x0000fa71, 0x807d817d,
-       0xb8f1f813, 0xd7610002,
-       0x0000fa71, 0x807d817d,
-       0xb8faf802, 0xd7610002,
+       0x0000fa78, 0x807d817d,
+       0xb8faf811, 0xd7610002,
        0x0000fa7a, 0x807d817d,
-       0xbefa50c1, 0xbfc70000,
+       0xd7610002, 0x0000fa6f,
+       0x807d817d, 0xb8f1f801,
+       0x937aff6d, 0x00060019,
+       0x847a8c7a, 0x8c717a71,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8f1f814,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8f1f815,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8f1f812,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8f1f813,
+       0xd7610002, 0x0000fa71,
+       0x807d817d, 0xb8faf802,
        0xd7610002, 0x0000fa7a,
-       0x807d817d, 0xbefa4c88,
+       0x807d817d, 0xbefa50c1,
        0xbfc70000, 0xd7610002,
        0x0000fa7a, 0x807d817d,
-       0xbefe00ff, 0x0000ffff,
-       0xbeff0080, 0x80767074,
-       0x82778075, 0xee0a4076,
-       0x010c0000, 0x00000000,
-       0xbefe00c1, 0x7e040280,
-       0xbefa5081, 0xbfc70000,
-       0xd7610002, 0x0001007a,
-       0xbefa5082, 0xbfc70000,
-       0xd7610002, 0x0001027a,
-       0xbefa5083, 0xbfc70000,
-       0xd7610002, 0x0001047a,
-       0xbefa5084, 0xbfc70000,
-       0xd7610002, 0x0001067a,
-       0xbefa5085, 0xbfc70000,
-       0xd7610002, 0x0001087a,
-       0xbefa5086, 0xbfc70000,
-       0xd7610002, 0x00010a7a,
-       0xbefa5087, 0xbfc70000,
-       0xd7610002, 0x00010c7a,
-       0xbefa5088, 0xbfc70000,
-       0xd7610002, 0x00010e7a,
-       0xbefa5089, 0xbfc70000,
-       0xd7610002, 0x0001107a,
-       0xbefa508a, 0xbfc70000,
-       0xd7610002, 0x0001127a,
-       0xbefa508b, 0xbfc70000,
-       0xd7610002, 0x0001147a,
-       0xbefa508c, 0xbfc70000,
-       0xd7610002, 0x0001167a,
-       0xbefa508d, 0xbfc70000,
-       0xd7610002, 0x0001187a,
-       0xbefa508e, 0xbfc70000,
-       0xd7610002, 0x00011a7a,
-       0xbefa508f, 0xbfc70000,
-       0xd7610002, 0x00011c7a,
-       0xbefa5090, 0xbfc70000,
-       0xd7610002, 0x00011e7a,
+       0xbefa4c88, 0xbfc70000,
+       0xd7610002, 0x0000fa7a,
+       0x807d817d, 0xbefe00ff,
+       0x0000ffff, 0xbeff0080,
+       0x80767074, 0x82778075,
        0xee0a4076, 0x010c0000,
-       0x00008000, 0xb8f03b05,
-       0x80708170, 0xbf0d9973,
-       0xbfa20002, 0x84708970,
-       0xbfa00001, 0x84708a70,
-       0xbef90080, 0xbefd0080,
-       0xbf800000, 0xbe804100,
-       0xbe824102, 0xbe844104,
-       0xbe864106, 0xbe884108,
-       0xbe8a410a, 0xbe8c410c,
-       0xbe8e410e, 0xd7610002,
-       0x0000f200, 0x80798179,
-       0xd7610002, 0x0000f201,
-       0x80798179, 0xd7610002,
-       0x0000f202, 0x80798179,
-       0xd7610002, 0x0000f203,
-       0x80798179, 0xd7610002,
-       0x0000f204, 0x80798179,
-       0xd7610002, 0x0000f205,
-       0x80798179, 0xd7610002,
-       0x0000f206, 0x80798179,
-       0xd7610002, 0x0000f207,
-       0x80798179, 0xd7610002,
-       0x0000f208, 0x80798179,
-       0xd7610002, 0x0000f209,
-       0x80798179, 0xd7610002,
-       0x0000f20a, 0x80798179,
-       0xd7610002, 0x0000f20b,
-       0x80798179, 0xd7610002,
-       0x0000f20c, 0x80798179,
-       0xd7610002, 0x0000f20d,
-       0x80798179, 0xd7610002,
-       0x0000f20e, 0x80798179,
-       0xd7610002, 0x0000f20f,
-       0x80798179, 0xbf06a079,
-       0xbfa10009, 0x80767074,
-       0x82778075, 0xee0a4076,
-       0x010c0000, 0x00000000,
-       0x8070ff70, 0x00000080,
-       0xbef90080, 0x7e040280,
-       0x807d907d, 0xbf0aff7d,
-       0x00000060, 0xbfa2ffb9,
+       0x00000000, 0xbefe00c1,
+       0x7e040280, 0xbefa5081,
+       0xbfc70000, 0xd7610002,
+       0x0001007a, 0xbefa5082,
+       0xbfc70000, 0xd7610002,
+       0x0001027a, 0xbefa5083,
+       0xbfc70000, 0xd7610002,
+       0x0001047a, 0xbefa5084,
+       0xbfc70000, 0xd7610002,
+       0x0001067a, 0xbefa5085,
+       0xbfc70000, 0xd7610002,
+       0x0001087a, 0xbefa5086,
+       0xbfc70000, 0xd7610002,
+       0x00010a7a, 0xbefa5087,
+       0xbfc70000, 0xd7610002,
+       0x00010c7a, 0xbefa5088,
+       0xbfc70000, 0xd7610002,
+       0x00010e7a, 0xbefa5089,
+       0xbfc70000, 0xd7610002,
+       0x0001107a, 0xbefa508a,
+       0xbfc70000, 0xd7610002,
+       0x0001127a, 0xbefa508b,
+       0xbfc70000, 0xd7610002,
+       0x0001147a, 0xbefa508c,
+       0xbfc70000, 0xd7610002,
+       0x0001167a, 0xbefa508d,
+       0xbfc70000, 0xd7610002,
+       0x0001187a, 0xbefa508e,
+       0xbfc70000, 0xd7610002,
+       0x00011a7a, 0xbefa508f,
+       0xbfc70000, 0xd7610002,
+       0x00011c7a, 0xbefa5090,
+       0xbfc70000, 0xd7610002,
+       0x00011e7a, 0xee0a4076,
+       0x010c0000, 0x00008000,
+       0xb8f03b05, 0x80708170,
+       0xbf0d9973, 0xbfa20002,
+       0x84708970, 0xbfa00001,
+       0x84708a70, 0xbef90080,
+       0xbefd0080, 0xbf800000,
        0xbe804100, 0xbe824102,
        0xbe844104, 0xbe864106,
        0xbe884108, 0xbe8a410a,
+       0xbe8c410c, 0xbe8e410e,
        0xd7610002, 0x0000f200,
        0x80798179, 0xd7610002,
        0x0000f201, 0x80798179,
@@ -5052,271 +4944,307 @@ static const uint32_t cwsr_trap_gfx12_1_0_hex[] = {
        0xd7610002, 0x0000f20a,
        0x80798179, 0xd7610002,
        0x0000f20b, 0x80798179,
-       0xbefe00ff, 0x0000ffff,
+       0xd7610002, 0x0000f20c,
+       0x80798179, 0xd7610002,
+       0x0000f20d, 0x80798179,
+       0xd7610002, 0x0000f20e,
+       0x80798179, 0xd7610002,
+       0x0000f20f, 0x80798179,
+       0xbf06a079, 0xbfa10009,
        0x80767074, 0x82778075,
        0xee0a4076, 0x010c0000,
-       0x00000000, 0xbefe00c1,
-       0x857d9973, 0x8b7d817d,
-       0xbf06817d, 0xbfa20002,
-       0xbeff0080, 0xbfa00001,
-       0xbeff00c1, 0xb8fb4306,
-       0x8b7bc17b, 0xbfa10042,
-       0x8b7aff6d, 0x80000000,
-       0xbfa1003f, 0x847b8a7b,
-       0xb8f03b05, 0x80708170,
-       0xbf0d9973, 0xbfa20002,
-       0x84708970, 0xbfa00001,
-       0x84708a70, 0x8070ff70,
-       0x00000200, 0x8070ff70,
-       0x00000200, 0xd71f0000,
-       0x000100c1, 0xd7200000,
-       0x000200c1, 0x16000084,
-       0x857d9973, 0x8b7d817d,
-       0xbf06817d, 0xbefd0080,
-       0xbfa20015, 0xbe8300ff,
-       0x00000080, 0xbf800000,
-       0xbf800000, 0xbf800000,
-       0xd8d80000, 0x01000000,
-       0xbf8a0000, 0x80767074,
+       0x00000000, 0x8070ff70,
+       0x00000080, 0xbef90080,
+       0x7e040280, 0x807d907d,
+       0xbf0aff7d, 0x00000060,
+       0xbfa2ffb9, 0xbe804100,
+       0xbe824102, 0xbe844104,
+       0xbe864106, 0xbe884108,
+       0xbe8a410a, 0xd7610002,
+       0x0000f200, 0x80798179,
+       0xd7610002, 0x0000f201,
+       0x80798179, 0xd7610002,
+       0x0000f202, 0x80798179,
+       0xd7610002, 0x0000f203,
+       0x80798179, 0xd7610002,
+       0x0000f204, 0x80798179,
+       0xd7610002, 0x0000f205,
+       0x80798179, 0xd7610002,
+       0x0000f206, 0x80798179,
+       0xd7610002, 0x0000f207,
+       0x80798179, 0xd7610002,
+       0x0000f208, 0x80798179,
+       0xd7610002, 0x0000f209,
+       0x80798179, 0xd7610002,
+       0x0000f20a, 0x80798179,
+       0xd7610002, 0x0000f20b,
+       0x80798179, 0xbefe00ff,
+       0x0000ffff, 0x80767074,
        0x82778075, 0xee0a4076,
-       0x008c0000, 0x00000000,
-       0x807d037d, 0x80700370,
-       0xd5250000, 0x0001ff00,
-       0x00000080, 0xbf0a7b7d,
-       0xbfa2fff1, 0xbfa00014,
-       0xbe8300ff, 0x00000100,
-       0xbf800000, 0xbf800000,
-       0xbf800000, 0xd8d80000,
-       0x01000000, 0xbf8a0000,
-       0x80767074, 0x82778075,
-       0xee0a4076, 0x008c0000,
-       0x00000000, 0x807d037d,
-       0x80700370, 0xd5250000,
-       0x0001ff00, 0x00000100,
-       0xbf0a7b7d, 0xbfa2fff1,
+       0x010c0000, 0x00000000,
        0xbefe00c1, 0x857d9973,
        0x8b7d817d, 0xbf06817d,
-       0xbfa20004, 0xbef000ff,
-       0x00000200, 0xbeff0080,
-       0xbfa00003, 0xbef000ff,
-       0x00000400, 0xbeff00c1,
-       0xb8fb3b05, 0x807b817b,
-       0x847b827b, 0x857d9973,
+       0xbfa20002, 0xbeff0080,
+       0xbfa00001, 0xbeff00c1,
+       0xb8fb4306, 0x8b7bc17b,
+       0xbfa10042, 0x8b7aff6d,
+       0x80000000, 0xbfa1003f,
+       0x847b8a7b, 0xb8f03b05,
+       0x80708170, 0xbf0d9973,
+       0xbfa20002, 0x84708970,
+       0xbfa00001, 0x84708a70,
+       0x8070ff70, 0x00000200,
+       0x8070ff70, 0x00000200,
+       0xd71f0000, 0x000100c1,
+       0xd7200000, 0x000200c1,
+       0x16000084, 0x857d9973,
        0x8b7d817d, 0xbf06817d,
-       0xbfa2001b, 0xbefd0084,
-       0xbf0a7b7d, 0xbfa10032,
-       0x7e008700, 0x7e028701,
-       0x7e048702, 0x7e068703,
-       0x80767074, 0x82778075,
-       0xee0a4076, 0x000c0000,
-       0x00000000, 0xee0a4076,
-       0x008c0000, 0x00008000,
-       0xee0a4076, 0x010c0000,
-       0x00010000, 0xee0a4076,
-       0x018c0000, 0x00018000,
-       0x807d847d, 0x8070ff70,
-       0x00000200, 0xbf0a7b7d,
-       0xbfa2ffe9, 0xbfa0001a,
+       0xbefd0080, 0xbfa20015,
+       0xbe8300ff, 0x00000080,
+       0xbf800000, 0xbf800000,
+       0xbf800000, 0xd8d80000,
+       0x01000000, 0xbf8a0000,
+       0x80767074, 0x82778075,
+       0xee0a4076, 0x008c0000,
+       0x00000000, 0x807d037d,
+       0x80700370, 0xd5250000,
+       0x0001ff00, 0x00000080,
+       0xbf0a7b7d, 0xbfa2fff1,
+       0xbfa00014, 0xbe8300ff,
+       0x00000100, 0xbf800000,
+       0xbf800000, 0xbf800000,
+       0xd8d80000, 0x01000000,
+       0xbf8a0000, 0x80767074,
+       0x82778075, 0xee0a4076,
+       0x008c0000, 0x00000000,
+       0x807d037d, 0x80700370,
+       0xd5250000, 0x0001ff00,
+       0x00000100, 0xbf0a7b7d,
+       0xbfa2fff1, 0xbefe00c1,
+       0x857d9973, 0x8b7d817d,
+       0xbf06817d, 0xbfa20004,
+       0xbef000ff, 0x00000200,
+       0xbeff0080, 0xbfa00003,
+       0xbef000ff, 0x00000400,
+       0xbeff00c1, 0xb8fb3b05,
+       0x807b817b, 0x847b827b,
+       0x857d9973, 0x8b7d817d,
+       0xbf06817d, 0xbfa2001b,
        0xbefd0084, 0xbf0a7b7d,
-       0xbfa10017, 0x7e008700,
+       0xbfa10032, 0x7e008700,
        0x7e028701, 0x7e048702,
        0x7e068703, 0x80767074,
        0x82778075, 0xee0a4076,
        0x000c0000, 0x00000000,
        0xee0a4076, 0x008c0000,
-       0x00010000, 0xee0a4076,
-       0x010c0000, 0x00020000,
+       0x00008000, 0xee0a4076,
+       0x010c0000, 0x00010000,
        0xee0a4076, 0x018c0000,
-       0x00030000, 0x807d847d,
-       0x8070ff70, 0x00000400,
+       0x00018000, 0x807d847d,
+       0x8070ff70, 0x00000200,
        0xbf0a7b7d, 0xbfa2ffe9,
-       0xbfa00180, 0xbef4007e,
-       0x8b75ff7f, 0x01ffffff,
-       0xbef1007f, 0xb8f20742,
-       0x84729972, 0x8b6eff7f,
-       0x04000000, 0xbfa10044,
+       0xbfa0001a, 0xbefd0084,
+       0xbf0a7b7d, 0xbfa10017,
+       0x7e008700, 0x7e028701,
+       0x7e048702, 0x7e068703,
+       0x80767074, 0x82778075,
+       0xee0a4076, 0x000c0000,
+       0x00000000, 0xee0a4076,
+       0x008c0000, 0x00010000,
+       0xee0a4076, 0x010c0000,
+       0x00020000, 0xee0a4076,
+       0x018c0000, 0x00030000,
+       0x807d847d, 0x8070ff70,
+       0x00000400, 0xbf0a7b7d,
+       0xbfa2ffe9, 0xbfa00183,
+       0xbef4007e, 0x8b75ff7f,
+       0x01ffffff, 0xbef1007f,
+       0xb8f20742, 0x84729972,
+       0x8b6eff7f, 0x04000000,
+       0xbfa10044, 0xbefe00c1,
+       0x857d9972, 0x8b7d817d,
+       0xbf06817d, 0xbfa20002,
+       0xbeff0080, 0xbfa00001,
+       0xbeff00c1, 0xb8ef4306,
+       0x8b6fc16f, 0xbfa10039,
+       0x846f8a6f, 0xb8f83b05,
+       0x80788178, 0xbf0d9972,
+       0xbfa20002, 0x84788978,
+       0xbfa00001, 0x84788a78,
+       0x8078ff78, 0x00000200,
+       0x8078ff78, 0x00000200,
+       0x857d9972, 0x8b7d817d,
+       0xbf06817d, 0xbefd0080,
+       0xd71f0001, 0x000100c1,
+       0xd7200001, 0x000202c1,
+       0x30020282, 0xbfa20012,
+       0x80767874, 0x82778075,
+       0xee0a0076, 0x000c0000,
+       0x00000000, 0xbf8a0000,
+       0xd8340000, 0x00000001,
+       0xd5250001, 0x0001ff01,
+       0x00000080, 0x807dff7d,
+       0x00000080, 0x8078ff78,
+       0x00000080, 0xbf0a6f7d,
+       0xbfa2ffef, 0xbfa00011,
+       0x80767874, 0x82778075,
+       0xee0a0076, 0x000c0000,
+       0x00000000, 0xbf8a0000,
+       0xd8340000, 0x00000001,
+       0xd5250001, 0x0001ff01,
+       0x00000100, 0x807dff7d,
+       0x00000100, 0x8078ff78,
+       0x00000100, 0xbf0a6f7d,
+       0xbfa2ffef, 0xbef80080,
        0xbefe00c1, 0x857d9972,
        0x8b7d817d, 0xbf06817d,
        0xbfa20002, 0xbeff0080,
        0xbfa00001, 0xbeff00c1,
-       0xb8ef4306, 0x8b6fc16f,
-       0xbfa10039, 0x846f8a6f,
-       0xb8f83b05, 0x80788178,
-       0xbf0d9972, 0xbfa20002,
-       0x84788978, 0xbfa00001,
-       0x84788a78, 0x8078ff78,
-       0x00000200, 0x8078ff78,
-       0x00000200, 0x857d9972,
+       0xb8ef3b05, 0x806f816f,
+       0x846f826f, 0x857d9972,
        0x8b7d817d, 0xbf06817d,
-       0xbefd0080, 0xd71f0001,
-       0x000100c1, 0xd7200001,
-       0x000202c1, 0x30020282,
-       0xbfa20012, 0x80767874,
+       0xbfa2002c, 0xbeee0078,
+       0x8078ff78, 0x00000200,
+       0xbefd0084, 0x80767874,
        0x82778075, 0xee0a0076,
        0x000c0000, 0x00000000,
-       0xbf8a0000, 0xd8340000,
-       0x00000001, 0xd5250001,
-       0x0001ff01, 0x00000080,
-       0x807dff7d, 0x00000080,
-       0x8078ff78, 0x00000080,
-       0xbf0a6f7d, 0xbfa2ffef,
-       0xbfa00011, 0x80767874,
+       0xee0a0076, 0x000c0001,
+       0x00008000, 0xee0a0076,
+       0x000c0002, 0x00010000,
+       0xee0a0076, 0x000c0003,
+       0x00018000, 0xbf8a0000,
+       0x7e008500, 0x7e028501,
+       0x7e048502, 0x7e068503,
+       0x807d847d, 0x8078ff78,
+       0x00000200, 0xbf0a6f7d,
+       0xbfa2ffe8, 0x80766e74,
        0x82778075, 0xee0a0076,
        0x000c0000, 0x00000000,
-       0xbf8a0000, 0xd8340000,
-       0x00000001, 0xd5250001,
-       0x0001ff01, 0x00000100,
-       0x807dff7d, 0x00000100,
-       0x8078ff78, 0x00000100,
-       0xbf0a6f7d, 0xbfa2ffef,
-       0xbef80080, 0xbefe00c1,
-       0x857d9972, 0x8b7d817d,
-       0xbf06817d, 0xbfa20002,
-       0xbeff0080, 0xbfa00001,
-       0xbeff00c1, 0xb8ef3b05,
-       0x806f816f, 0x846f826f,
-       0x857d9972, 0x8b7d817d,
-       0xbf06817d, 0xbfa2002c,
-       0xbeee0078, 0x8078ff78,
-       0x00000200, 0xbefd0084,
-       0x80767874, 0x82778075,
-       0xee0a0076, 0x000c0000,
-       0x00000000, 0xee0a0076,
-       0x000c0001, 0x00008000,
-       0xee0a0076, 0x000c0002,
+       0xee0a0076, 0x000c0001,
+       0x00008000, 0xee0a0076,
+       0x000c0002, 0x00010000,
+       0xee0a0076, 0x000c0003,
+       0x00018000, 0xbf8a0000,
+       0xbfa0002d, 0xbeee0078,
+       0x8078ff78, 0x00000400,
+       0xbefd0084, 0xbf0a6f7d,
+       0xbfa10018, 0x80767874,
+       0x82778075, 0xee0a0076,
+       0x000c0000, 0x00000000,
+       0xee0a0076, 0x000c0001,
        0x00010000, 0xee0a0076,
-       0x000c0003, 0x00018000,
-       0xbf8a0000, 0x7e008500,
-       0x7e028501, 0x7e048502,
-       0x7e068503, 0x807d847d,
-       0x8078ff78, 0x00000200,
-       0xbf0a6f7d, 0xbfa2ffe8,
-       0x80766e74, 0x82778075,
-       0xee0a0076, 0x000c0000,
-       0x00000000, 0xee0a0076,
-       0x000c0001, 0x00008000,
-       0xee0a0076, 0x000c0002,
+       0x000c0002, 0x00020000,
+       0xee0a0076, 0x000c0003,
+       0x00030000, 0xbf8a0000,
+       0x7e008500, 0x7e028501,
+       0x7e048502, 0x7e068503,
+       0x807d847d, 0x8078ff78,
+       0x00000400, 0xbf0a6f7d,
+       0xbfa2ffe8, 0x80766e74,
+       0x82778075, 0xee0a0076,
+       0x000c0000, 0x00000000,
+       0xee0a0076, 0x000c0001,
        0x00010000, 0xee0a0076,
-       0x000c0003, 0x00018000,
-       0xbf8a0000, 0xbfa0002d,
-       0xbeee0078, 0x8078ff78,
-       0x00000400, 0xbefd0084,
-       0xbf0a6f7d, 0xbfa10018,
-       0x80767874, 0x82778075,
-       0xee0a0076, 0x000c0000,
-       0x00000000, 0xee0a0076,
-       0x000c0001, 0x00010000,
-       0xee0a0076, 0x000c0002,
-       0x00020000, 0xee0a0076,
-       0x000c0003, 0x00030000,
-       0xbf8a0000, 0x7e008500,
-       0x7e028501, 0x7e048502,
-       0x7e068503, 0x807d847d,
-       0x8078ff78, 0x00000400,
-       0xbf0a6f7d, 0xbfa2ffe8,
-       0x80766e74, 0x82778075,
-       0xee0a0076, 0x000c0000,
-       0x00000000, 0xee0a0076,
-       0x000c0001, 0x00010000,
-       0xee0a0076, 0x000c0002,
-       0x00020000, 0xee0a0076,
-       0x000c0003, 0x00030000,
-       0xbf8a0000, 0xb8f83b05,
-       0x80788178, 0xbf0d9972,
-       0xbfa20002, 0x84788978,
-       0xbfa00001, 0x84788a78,
-       0x8078ff78, 0x00000200,
-       0x80f8ff78, 0x00000060,
-       0x80767874, 0x82778075,
-       0xbefd00ff, 0x0000006c,
-       0xf460403b, 0xf8000000,
-       0xbf8a0000, 0x80fd847d,
-       0xbf800000, 0xbe804300,
-       0xbe824302, 0x80f6a076,
-       0x82f78077, 0xf460603b,
+       0x000c0002, 0x00020000,
+       0xee0a0076, 0x000c0003,
+       0x00030000, 0xbf8a0000,
+       0xb8f83b05, 0x80788178,
+       0xbf0d9972, 0xbfa20002,
+       0x84788978, 0xbfa00001,
+       0x84788a78, 0x8078ff78,
+       0x00000200, 0x80f8ff78,
+       0x00000060, 0x80767874,
+       0x82778075, 0xbefd00ff,
+       0x0000006c, 0xf460403b,
        0xf8000000, 0xbf8a0000,
-       0x80fd887d, 0xbf800000,
+       0x80fd847d, 0xbf800000,
        0xbe804300, 0xbe824302,
-       0xbe844304, 0xbe864306,
-       0x80f6c076, 0x82f78077,
-       0xf460803b, 0xf8000000,
-       0xbf8a0000, 0x80fd907d,
+       0x80f6a076, 0x82f78077,
+       0xf460603b, 0xf8000000,
+       0xbf8a0000, 0x80fd887d,
        0xbf800000, 0xbe804300,
        0xbe824302, 0xbe844304,
-       0xbe864306, 0xbe884308,
-       0xbe8a430a, 0xbe8c430c,
-       0xbe8e430e, 0xbf06807d,
-       0xbfa1ffef, 0xb980f801,
-       0x00000000, 0xb8f83b05,
-       0x80788178, 0xbf0d9972,
-       0xbfa20002, 0x84788978,
-       0xbfa00001, 0x84788a78,
-       0x8078ff78, 0x00000200,
-       0x80767874, 0x82778075,
-       0xbeff0071, 0xf4601bfb,
-       0xf8000000, 0xf4601b3b,
-       0xf8000004, 0xf4601b7b,
-       0xf8000008, 0xf4601c3b,
-       0xf800000c, 0xf4601c7b,
-       0xf8000010, 0xf4601ebb,
-       0xf8000014, 0xf4601efb,
-       0xf8000018, 0xf4601e7b,
-       0xf800001c, 0xf4601cfb,
-       0xf8000020, 0xf4601bbb,
-       0xf8000024, 0xbf8a0000,
-       0xb96ef814, 0xf4601bbb,
-       0xf8000028, 0xbf8a0000,
-       0xb96ef815, 0xf4601bbb,
-       0xf800002c, 0xbf8a0000,
-       0xb96ef812, 0xf4601bbb,
-       0xf8000030, 0xbf8a0000,
-       0xb96ef813, 0x8b6eff7f,
-       0x04000000, 0xbfa10022,
-       0xf4601bbb, 0xf8000038,
-       0xbf8a0000, 0xbf0d806e,
-       0xbfa1001d, 0x856e906e,
-       0x8b6e6e6e, 0xbfa10003,
-       0xbe804ec1, 0x816ec16e,
-       0xbfa0fffb, 0xbef800ff,
-       0x00000080, 0xbefd0081,
-       0xf4601bbb, 0xf0000000,
-       0xbfc70000, 0x80788478,
-       0x937eff6e, 0x00070004,
-       0x847e907e, 0x8c7d7e7d,
-       0xbe80517d, 0x917dff7d,
-       0x007f0000, 0x856e906e,
-       0x8b6e6e6e, 0xbfa10003,
-       0xbe804e7d, 0x816ec16e,
-       0xbfa0fffb, 0x807d817d,
-       0xbf08907d, 0xbfa1ffec,
-       0xf4601bbb, 0xf800003c,
-       0xbfc70000, 0xbf0d806e,
-       0xbfa1000c, 0xbf0d9a7f,
-       0xbfa10002, 0xbf068180,
-       0xbe804fc4, 0xbf94fffc,
-       0xbfa10006, 0x856e906e,
-       0x8b6e6e6e, 0xbfa10003,
-       0xbe804ec3, 0x816ec16e,
-       0xbfa0fffb, 0xbefd006f,
-       0xbefe0070, 0xbeff0071,
-       0xb979f822, 0xb97b2011,
-       0x857b867b, 0xb97b0191,
-       0x857b827b, 0xb97bba11,
-       0xb973f801, 0xb8ee3b05,
-       0x806e816e, 0xbf0d9972,
-       0xbfa20002, 0x846e896e,
-       0xbfa00001, 0x846e8a6e,
-       0x806eff6e, 0x000001c0,
-       0x806e746e, 0x826f8075,
-       0xf4605c37, 0xf8000010,
-       0xf4605d37, 0xf8000020,
-       0xf4601e77, 0xf8000034,
-       0xbf8a0000, 0x856e9677,
-       0xb96e04a1, 0x856e9577,
-       0xb96e0421, 0x856e8e77,
-       0xb96e3021, 0x8b6dff6d,
-       0x01ffffff, 0x8bfe7e7e,
-       0x8bea6a6a, 0xb97af804,
+       0xbe864306, 0x80f6c076,
+       0x82f78077, 0xf460803b,
+       0xf8000000, 0xbf8a0000,
+       0x80fd907d, 0xbf800000,
+       0xbe804300, 0xbe824302,
+       0xbe844304, 0xbe864306,
+       0xbe884308, 0xbe8a430a,
+       0xbe8c430c, 0xbe8e430e,
+       0xbf06807d, 0xbfa1ffef,
+       0xb980f801, 0x00000000,
+       0xb8f83b05, 0x80788178,
+       0xbf0d9972, 0xbfa20002,
+       0x84788978, 0xbfa00001,
+       0x84788a78, 0x8078ff78,
+       0x00000200, 0x80767874,
+       0x82778075, 0xbeff0071,
+       0xf4601bfb, 0xf8000000,
+       0xf4601b3b, 0xf8000004,
+       0xf4601b7b, 0xf8000008,
+       0xf4601c3b, 0xf800000c,
+       0xf4601c7b, 0xf8000010,
+       0xf4601ebb, 0xf8000014,
+       0xf4601efb, 0xf8000018,
+       0xf4601e7b, 0xf800001c,
+       0xf4601cfb, 0xf8000020,
+       0xf4601bbb, 0xf8000024,
+       0xbf8a0000, 0xb96ef814,
+       0xf4601bbb, 0xf8000028,
+       0xbf8a0000, 0xb96ef815,
+       0xf4601bbb, 0xf800002c,
+       0xbf8a0000, 0xb96ef812,
+       0xf4601bbb, 0xf8000030,
+       0xbf8a0000, 0xb96ef813,
+       0x8b6eff7f, 0x04000000,
+       0xbfa10022, 0xf4601bbb,
+       0xf8000038, 0xbf8a0000,
+       0xbf0d806e, 0xbfa1001d,
+       0x856e906e, 0x8b6e6e6e,
+       0xbfa10003, 0xbe804ec1,
+       0x816ec16e, 0xbfa0fffb,
+       0xbef800ff, 0x00000080,
+       0xbefd0081, 0xf4601bbb,
+       0xf0000000, 0xbfc70000,
+       0x80788478, 0x937eff6e,
+       0x00070004, 0x847e907e,
+       0x8c7d7e7d, 0xbe80517d,
+       0x917dff7d, 0x007f0000,
+       0x856e906e, 0x8b6e6e6e,
+       0xbfa10003, 0xbe804e7d,
+       0x816ec16e, 0xbfa0fffb,
+       0x807d817d, 0xbf08907d,
+       0xbfa1ffec, 0xf4601bbb,
+       0xf800003c, 0xbfc70000,
+       0xbf0d806e, 0xbfa1000c,
+       0xbf0d9a7f, 0xbfa10002,
+       0xbf068180, 0xbe804fc4,
+       0xbf94fffc, 0xbfa10006,
+       0x856e906e, 0x8b6e6e6e,
+       0xbfa10003, 0xbe804ec3,
+       0x816ec16e, 0xbfa0fffb,
+       0xbefd006f, 0xbefe0070,
+       0xbeff0071, 0xb979f822,
+       0xb97b2011, 0x857b867b,
+       0xb97b0191, 0x857b827b,
+       0xb97bba11, 0xb973f801,
+       0xb8ee3b05, 0x806e816e,
+       0xbf0d9972, 0xbfa20002,
+       0x846e896e, 0xbfa00001,
+       0x846e8a6e, 0x806eff6e,
+       0x000001c0, 0x806e746e,
+       0x826f8075, 0xf4605c37,
+       0xf8000010, 0xf4605d37,
+       0xf8000020, 0xf4601e77,
+       0xf8000034, 0xbf8a0000,
+       0x856e9677, 0xb96e04a1,
+       0x856e9577, 0xb96e0421,
+       0x856e8e77, 0xb96e3021,
+       0x8b6dff6d, 0x01ffffff,
+       0x8bfe7e7e, 0x8bea6a6a,
+       0x936eff77, 0x0002001a,
+       0xb96ef81a, 0xb97af804,
        0xb8eef802, 0xbf0c8b6e,
        0xbfa20003, 0xbe804fc2,
        0xbf94fffe, 0xbfa10001,

diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm
index abcb49b0fa3326ff86ebec562fb8dd578baba448..fc2c09139d2e009c92bd4919ca8bbd14a16a5079 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm
+++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm
@@ -1327,6 +1327,7 @@ end
 function restore_sched_mode(s_tmp)
        s_bfe_u32       s_tmp, ttmp11, (TTMP11_SCHED_MODE_SHIFT | (TTMP11_SCHED_MODE_SIZE << 0x10))
        s_setreg_b32    hwreg(HW_REG_WAVE_SCHED_MODE), s_tmp
+end
 
 function restore_barrier_signal_count(barrier_id)
        // extract the saved signal count from s_restore_tmp