aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2805-drm-amdkfd-Moved-gfx10-cwsr-binary-to-cwsr_trap_hand.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2805-drm-amdkfd-Moved-gfx10-cwsr-binary-to-cwsr_trap_hand.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2805-drm-amdkfd-Moved-gfx10-cwsr-binary-to-cwsr_trap_hand.patch657
1 files changed, 657 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2805-drm-amdkfd-Moved-gfx10-cwsr-binary-to-cwsr_trap_hand.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2805-drm-amdkfd-Moved-gfx10-cwsr-binary-to-cwsr_trap_hand.patch
new file mode 100644
index 00000000..1188c310
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/2805-drm-amdkfd-Moved-gfx10-cwsr-binary-to-cwsr_trap_hand.patch
@@ -0,0 +1,657 @@
+From 6aa70a6696033bbdaa84aa3a0193b428062a112f Mon Sep 17 00:00:00 2001
+From: Oak Zeng <Oak.Zeng@amd.com>
+Date: Tue, 24 Jul 2018 18:36:03 -0400
+Subject: [PATCH 2805/2940] drm/amdkfd: Moved gfx10 cwsr binary to
+ cwsr_trap_handler.h
+
+Same thing was done for previous HW generations. Do the same thing for
+gfx10 to make codes consistent.
+
+Signed-off-by: Oak Zeng <Oak.Zeng@amd.com>
+Reviewd-by: Yong Zhao <Yong.Zhao@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 299 +++++++++++++++++
+ .../amd/amdkfd/cwsr_trap_handler_gfx10.asm | 302 +-----------------
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 1 -
+ 3 files changed, 300 insertions(+), 302 deletions(-)
+
+diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
+index b0b982cd3f0d..dfa300975a45 100644
+--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
++++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
+@@ -674,3 +674,302 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {
+ 0xb97a0002, 0xbf8a0000,
+ 0x95806f6c, 0xbf810000,
+ };
++
++static const uint32_t cwsr_trap_gfx10_hex[] = {
++ 0xbf820001, 0xbf82012e,
++ 0xb0804004, 0xb970f802,
++ 0x8a708670, 0xb971f803,
++ 0x8771ff71, 0x00000400,
++ 0xbf850008, 0xb971f803,
++ 0x8771ff71, 0x000001ff,
++ 0xbf850001, 0x806c846c,
++ 0x876dff6d, 0x0000ffff,
++ 0xbe80226c, 0xb971f803,
++ 0x8771ff71, 0x00000100,
++ 0xbf840006, 0xbef60380,
++ 0xb9f60203, 0x876dff6d,
++ 0x0000ffff, 0x80ec886c,
++ 0x82ed806d, 0xbef60380,
++ 0xb9f60283, 0xb973f816,
++ 0xb9762c07, 0x8f769c76,
++ 0x886d766d, 0xb97603c7,
++ 0x8f769b76, 0x886d766d,
++ 0xb976f807, 0x8776ff76,
++ 0x00007fff, 0xb9f6f807,
++ 0xbeee037e, 0xbeef037f,
++ 0xbefe0480, 0xbf900004,
++ 0xbf8e0002, 0xbf88fffe,
++ 0xbef4037e, 0x8775ff7f,
++ 0x0000ffff, 0x8875ff75,
++ 0x00040000, 0xbef60380,
++ 0xbef703ff, 0x00807fac,
++ 0x8776ff7f, 0x08000000,
++ 0x90768376, 0x88777677,
++ 0x8776ff7f, 0x70000000,
++ 0x90768176, 0x88777677,
++ 0xbefb037c, 0xbefa0380,
++ 0xb97202dc, 0x8872727f,
++ 0xbefe03c1, 0x877c8172,
++ 0xbf06817c, 0xbf850002,
++ 0xbeff0380, 0xbf820001,
++ 0xbeff03c1, 0xb9712a05,
++ 0x80718171, 0x8f718271,
++ 0x877c8172, 0xbf06817c,
++ 0xbf85000d, 0x8f768771,
++ 0xbef603ff, 0x01000000,
++ 0xbefc0380, 0x7e008700,
++ 0xe0704000, 0x7a5d0000,
++ 0x807c817c, 0x807aff7a,
++ 0x00000080, 0xbf0a717c,
++ 0xbf85fff8, 0xbf82001b,
++ 0x8f768871, 0xbef603ff,
++ 0x01000000, 0xbefc0380,
++ 0x7e008700, 0xe0704000,
++ 0x7a5d0000, 0x807c817c,
++ 0x807aff7a, 0x00000100,
++ 0xbf0a717c, 0xbf85fff8,
++ 0xb9711e06, 0x8771c171,
++ 0xbf84000c, 0x8f718371,
++ 0x80717c71, 0xbefe03c1,
++ 0xbeff0380, 0x7e008700,
++ 0xe0704000, 0x7a5d0000,
++ 0x807c817c, 0x807aff7a,
++ 0x00000080, 0xbf0a717c,
++ 0xbf85fff8, 0xbf8a0000,
++ 0x8776ff72, 0x04000000,
++ 0xbf84002b, 0xbefe03c1,
++ 0x877c8172, 0xbf06817c,
++ 0xbf850002, 0xbeff0380,
++ 0xbf820001, 0xbeff03c1,
++ 0xb9714306, 0x8771c171,
++ 0xbf840021, 0x8f718671,
++ 0x8f718271, 0xbef60371,
++ 0xbef603ff, 0x01000000,
++ 0xd7650000, 0x000100c1,
++ 0xd7660000, 0x000200c1,
++ 0x16000084, 0x877c8172,
++ 0xbf06817c, 0xbefc0380,
++ 0xbf85000a, 0x807cff7c,
++ 0x00000080, 0x807aff7a,
++ 0x00000080, 0xd5250000,
++ 0x0001ff00, 0x00000080,
++ 0xbf0a717c, 0xbf85fff7,
++ 0xbf820009, 0x807cff7c,
++ 0x00000100, 0x807aff7a,
++ 0x00000100, 0xd5250000,
++ 0x0001ff00, 0x00000100,
++ 0xbf0a717c, 0xbf85fff7,
++ 0x877c8172, 0xbf06817c,
++ 0xbf850003, 0x8f7687ff,
++ 0x0000006a, 0xbf820002,
++ 0x8f7688ff, 0x0000006a,
++ 0xbef603ff, 0x01000000,
++ 0x877c8172, 0xbf06817c,
++ 0xbefc0380, 0xbf800000,
++ 0xbf85000b, 0xbe802e00,
++ 0x7e000200, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000080, 0x807c817c,
++ 0xbf0aff7c, 0x0000006a,
++ 0xbf85fff6, 0xbf82000a,
++ 0xbe802e00, 0x7e000200,
++ 0xe0704000, 0x7a5d0000,
++ 0x807aff7a, 0x00000100,
++ 0x807c817c, 0xbf0aff7c,
++ 0x0000006a, 0xbf85fff6,
++ 0xbef60384, 0xbef603ff,
++ 0x01000000, 0x877c8172,
++ 0xbf06817c, 0xbf850030,
++ 0x7e00027b, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000080, 0x7e00026c,
++ 0xe0704000, 0x7a5d0000,
++ 0x807aff7a, 0x00000080,
++ 0x7e00026d, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000080, 0x7e00026e,
++ 0xe0704000, 0x7a5d0000,
++ 0x807aff7a, 0x00000080,
++ 0x7e00026f, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000080, 0x7e000270,
++ 0xe0704000, 0x7a5d0000,
++ 0x807aff7a, 0x00000080,
++ 0xb971f803, 0x7e000271,
++ 0xe0704000, 0x7a5d0000,
++ 0x807aff7a, 0x00000080,
++ 0x7e000273, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000080, 0xb97bf801,
++ 0x7e00027b, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000080, 0xbf82002f,
++ 0x7e00027b, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000100, 0x7e00026c,
++ 0xe0704000, 0x7a5d0000,
++ 0x807aff7a, 0x00000100,
++ 0x7e00026d, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000100, 0x7e00026e,
++ 0xe0704000, 0x7a5d0000,
++ 0x807aff7a, 0x00000100,
++ 0x7e00026f, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000100, 0x7e000270,
++ 0xe0704000, 0x7a5d0000,
++ 0x807aff7a, 0x00000100,
++ 0xb971f803, 0x7e000271,
++ 0xe0704000, 0x7a5d0000,
++ 0x807aff7a, 0x00000100,
++ 0x7e000273, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000100, 0xb97bf801,
++ 0x7e00027b, 0xe0704000,
++ 0x7a5d0000, 0x807aff7a,
++ 0x00000100, 0xbf820119,
++ 0xbef4037e, 0x8775ff7f,
++ 0x0000ffff, 0x8875ff75,
++ 0x00040000, 0xbef60380,
++ 0xbef703ff, 0x00807fac,
++ 0x8772ff7f, 0x08000000,
++ 0x90728372, 0x88777277,
++ 0x8772ff7f, 0x70000000,
++ 0x90728172, 0x88777277,
++ 0xb97902dc, 0x8879797f,
++ 0xbef80380, 0xbefe03c1,
++ 0x877c8179, 0xbf06817c,
++ 0xbf850002, 0xbeff0380,
++ 0xbf820001, 0xbeff03c1,
++ 0xb96f2a05, 0x806f816f,
++ 0x8f6f826f, 0x877c8179,
++ 0xbf06817c, 0xbf850013,
++ 0x8f76876f, 0xbef603ff,
++ 0x01000000, 0xbef20378,
++ 0x8078ff78, 0x00000080,
++ 0xbefc0381, 0xe0304000,
++ 0x785d0000, 0xbf8c3f70,
++ 0x7e008500, 0x807c817c,
++ 0x8078ff78, 0x00000080,
++ 0xbf0a6f7c, 0xbf85fff7,
++ 0xe0304000, 0x725d0000,
++ 0xbf820023, 0x8f76886f,
++ 0xbef603ff, 0x01000000,
++ 0xbef20378, 0x8078ff78,
++ 0x00000100, 0xbefc0381,
++ 0xe0304000, 0x785d0000,
++ 0xbf8c3f70, 0x7e008500,
++ 0x807c817c, 0x8078ff78,
++ 0x00000100, 0xbf0a6f7c,
++ 0xbf85fff7, 0xb96f1e06,
++ 0x876fc16f, 0xbf84000e,
++ 0x8f6f836f, 0x806f7c6f,
++ 0xbefe03c1, 0xbeff0380,
++ 0xe0304000, 0x785d0000,
++ 0xbf8c3f70, 0x7e008500,
++ 0x807c817c, 0x8078ff78,
++ 0x00000080, 0xbf0a6f7c,
++ 0xbf85fff7, 0xbeff03c1,
++ 0xe0304000, 0x725d0000,
++ 0x8772ff79, 0x04000000,
++ 0xbf840020, 0xbefe03c1,
++ 0x877c8179, 0xbf06817c,
++ 0xbf850002, 0xbeff0380,
++ 0xbf820001, 0xbeff03c1,
++ 0xb96f4306, 0x876fc16f,
++ 0xbf840016, 0x8f6f866f,
++ 0x8f6f826f, 0xbef6036f,
++ 0xbef603ff, 0x01000000,
++ 0x877c8172, 0xbf06817c,
++ 0xbefc0380, 0xbf850007,
++ 0x807cff7c, 0x00000080,
++ 0x8078ff78, 0x00000080,
++ 0xbf0a6f7c, 0xbf85fffa,
++ 0xbf820006, 0x807cff7c,
++ 0x00000100, 0x8078ff78,
++ 0x00000100, 0xbf0a6f7c,
++ 0xbf85fffa, 0x877c8179,
++ 0xbf06817c, 0xbf850003,
++ 0x8f7687ff, 0x0000006a,
++ 0xbf820002, 0x8f7688ff,
++ 0x0000006a, 0xbef603ff,
++ 0x01000000, 0x877c8179,
++ 0xbf06817c, 0xbf850012,
++ 0xf4211cba, 0xf0000000,
++ 0x8078ff78, 0x00000080,
++ 0xbefc0381, 0xf421003a,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xbf8cc07f,
++ 0xbe803000, 0xbf800000,
++ 0x807c817c, 0xbf0aff7c,
++ 0x0000006a, 0xbf85fff5,
++ 0xbe800372, 0xbf820011,
++ 0xf4211cba, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xbefc0381, 0xf421003a,
++ 0xf0000000, 0x8078ff78,
++ 0x00000100, 0xbf8cc07f,
++ 0xbe803000, 0xbf800000,
++ 0x807c817c, 0xbf0aff7c,
++ 0x0000006a, 0xbf85fff5,
++ 0xbe800372, 0xbef60384,
++ 0xbef603ff, 0x01000000,
++ 0x877c8179, 0xbf06817c,
++ 0xbf850025, 0xf4211bfa,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xf4211b3a,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xf4211b7a,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xf4211eba,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xf4211efa,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xf4211c3a,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xf4211c7a,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xf4211cfa,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xf4211e7a,
++ 0xf0000000, 0x8078ff78,
++ 0x00000080, 0xbf820024,
++ 0xf4211bfa, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xf4211b3a, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xf4211b7a, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xf4211eba, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xf4211efa, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xf4211c3a, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xf4211c7a, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xf4211cfa, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xf4211e7a, 0xf0000000,
++ 0x8078ff78, 0x00000100,
++ 0xbf8cc07f, 0x876dff6d,
++ 0x0000ffff, 0xbefc036f,
++ 0xbefe037a, 0xbeff037b,
++ 0x876f71ff, 0x000003ff,
++ 0xb9ef4803, 0xb9f3f816,
++ 0x876f71ff, 0xfffff800,
++ 0x906f8b6f, 0xb9efa2c3,
++ 0xb9f9f801, 0x876fff6d,
++ 0xf0000000, 0x906f9c6f,
++ 0x8f6f906f, 0xbef20380,
++ 0x88726f72, 0x876fff6d,
++ 0x08000000, 0x906f9b6f,
++ 0x8f6f8f6f, 0x88726f72,
++ 0x876fff70, 0x00800000,
++ 0x906f976f, 0xb9f2f807,
++ 0xb9f0f802, 0xbf8a0000,
++ 0xbe80226c, 0xbf810000,
++ 0xbf9f0000, 0xbf9f0000,
++ 0xbf9f0000, 0xbf9f0000,
++ 0xbf9f0000, 0x00000000,
++};
+diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm
+index e6d345f7998b..f20e463e748b 100644
+--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm
++++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm
+@@ -21,7 +21,6 @@
+ */
+
+
+-#if 0
+ shader main
+
+ asic(DEFAULT)
+@@ -1122,303 +1121,4 @@ function read_sgpr_from_mem_wave64(s, s_rsrc, s_mem_offset, use_sqc)
+ s_add_u32 s_mem_offset, s_mem_offset, 256
+ end
+ end
+-#endif
+-
+-static const uint32_t cwsr_trap_gfx10_hex[] = {
+- 0xbf820001, 0xbf82012e,
+- 0xb0804004, 0xb970f802,
+- 0x8a708670, 0xb971f803,
+- 0x8771ff71, 0x00000400,
+- 0xbf850008, 0xb971f803,
+- 0x8771ff71, 0x000001ff,
+- 0xbf850001, 0x806c846c,
+- 0x876dff6d, 0x0000ffff,
+- 0xbe80226c, 0xb971f803,
+- 0x8771ff71, 0x00000100,
+- 0xbf840006, 0xbef60380,
+- 0xb9f60203, 0x876dff6d,
+- 0x0000ffff, 0x80ec886c,
+- 0x82ed806d, 0xbef60380,
+- 0xb9f60283, 0xb973f816,
+- 0xb9762c07, 0x8f769c76,
+- 0x886d766d, 0xb97603c7,
+- 0x8f769b76, 0x886d766d,
+- 0xb976f807, 0x8776ff76,
+- 0x00007fff, 0xb9f6f807,
+- 0xbeee037e, 0xbeef037f,
+- 0xbefe0480, 0xbf900004,
+- 0xbf8e0002, 0xbf88fffe,
+- 0xbef4037e, 0x8775ff7f,
+- 0x0000ffff, 0x8875ff75,
+- 0x00040000, 0xbef60380,
+- 0xbef703ff, 0x00807fac,
+- 0x8776ff7f, 0x08000000,
+- 0x90768376, 0x88777677,
+- 0x8776ff7f, 0x70000000,
+- 0x90768176, 0x88777677,
+- 0xbefb037c, 0xbefa0380,
+- 0xb97202dc, 0x8872727f,
+- 0xbefe03c1, 0x877c8172,
+- 0xbf06817c, 0xbf850002,
+- 0xbeff0380, 0xbf820001,
+- 0xbeff03c1, 0xb9712a05,
+- 0x80718171, 0x8f718271,
+- 0x877c8172, 0xbf06817c,
+- 0xbf85000d, 0x8f768771,
+- 0xbef603ff, 0x01000000,
+- 0xbefc0380, 0x7e008700,
+- 0xe0704000, 0x7a5d0000,
+- 0x807c817c, 0x807aff7a,
+- 0x00000080, 0xbf0a717c,
+- 0xbf85fff8, 0xbf82001b,
+- 0x8f768871, 0xbef603ff,
+- 0x01000000, 0xbefc0380,
+- 0x7e008700, 0xe0704000,
+- 0x7a5d0000, 0x807c817c,
+- 0x807aff7a, 0x00000100,
+- 0xbf0a717c, 0xbf85fff8,
+- 0xb9711e06, 0x8771c171,
+- 0xbf84000c, 0x8f718371,
+- 0x80717c71, 0xbefe03c1,
+- 0xbeff0380, 0x7e008700,
+- 0xe0704000, 0x7a5d0000,
+- 0x807c817c, 0x807aff7a,
+- 0x00000080, 0xbf0a717c,
+- 0xbf85fff8, 0xbf8a0000,
+- 0x8776ff72, 0x04000000,
+- 0xbf84002b, 0xbefe03c1,
+- 0x877c8172, 0xbf06817c,
+- 0xbf850002, 0xbeff0380,
+- 0xbf820001, 0xbeff03c1,
+- 0xb9714306, 0x8771c171,
+- 0xbf840021, 0x8f718671,
+- 0x8f718271, 0xbef60371,
+- 0xbef603ff, 0x01000000,
+- 0xd7650000, 0x000100c1,
+- 0xd7660000, 0x000200c1,
+- 0x16000084, 0x877c8172,
+- 0xbf06817c, 0xbefc0380,
+- 0xbf85000a, 0x807cff7c,
+- 0x00000080, 0x807aff7a,
+- 0x00000080, 0xd5250000,
+- 0x0001ff00, 0x00000080,
+- 0xbf0a717c, 0xbf85fff7,
+- 0xbf820009, 0x807cff7c,
+- 0x00000100, 0x807aff7a,
+- 0x00000100, 0xd5250000,
+- 0x0001ff00, 0x00000100,
+- 0xbf0a717c, 0xbf85fff7,
+- 0x877c8172, 0xbf06817c,
+- 0xbf850003, 0x8f7687ff,
+- 0x0000006a, 0xbf820002,
+- 0x8f7688ff, 0x0000006a,
+- 0xbef603ff, 0x01000000,
+- 0x877c8172, 0xbf06817c,
+- 0xbefc0380, 0xbf800000,
+- 0xbf85000b, 0xbe802e00,
+- 0x7e000200, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000080, 0x807c817c,
+- 0xbf0aff7c, 0x0000006a,
+- 0xbf85fff6, 0xbf82000a,
+- 0xbe802e00, 0x7e000200,
+- 0xe0704000, 0x7a5d0000,
+- 0x807aff7a, 0x00000100,
+- 0x807c817c, 0xbf0aff7c,
+- 0x0000006a, 0xbf85fff6,
+- 0xbef60384, 0xbef603ff,
+- 0x01000000, 0x877c8172,
+- 0xbf06817c, 0xbf850030,
+- 0x7e00027b, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000080, 0x7e00026c,
+- 0xe0704000, 0x7a5d0000,
+- 0x807aff7a, 0x00000080,
+- 0x7e00026d, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000080, 0x7e00026e,
+- 0xe0704000, 0x7a5d0000,
+- 0x807aff7a, 0x00000080,
+- 0x7e00026f, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000080, 0x7e000270,
+- 0xe0704000, 0x7a5d0000,
+- 0x807aff7a, 0x00000080,
+- 0xb971f803, 0x7e000271,
+- 0xe0704000, 0x7a5d0000,
+- 0x807aff7a, 0x00000080,
+- 0x7e000273, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000080, 0xb97bf801,
+- 0x7e00027b, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000080, 0xbf82002f,
+- 0x7e00027b, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000100, 0x7e00026c,
+- 0xe0704000, 0x7a5d0000,
+- 0x807aff7a, 0x00000100,
+- 0x7e00026d, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000100, 0x7e00026e,
+- 0xe0704000, 0x7a5d0000,
+- 0x807aff7a, 0x00000100,
+- 0x7e00026f, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000100, 0x7e000270,
+- 0xe0704000, 0x7a5d0000,
+- 0x807aff7a, 0x00000100,
+- 0xb971f803, 0x7e000271,
+- 0xe0704000, 0x7a5d0000,
+- 0x807aff7a, 0x00000100,
+- 0x7e000273, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000100, 0xb97bf801,
+- 0x7e00027b, 0xe0704000,
+- 0x7a5d0000, 0x807aff7a,
+- 0x00000100, 0xbf820119,
+- 0xbef4037e, 0x8775ff7f,
+- 0x0000ffff, 0x8875ff75,
+- 0x00040000, 0xbef60380,
+- 0xbef703ff, 0x00807fac,
+- 0x8772ff7f, 0x08000000,
+- 0x90728372, 0x88777277,
+- 0x8772ff7f, 0x70000000,
+- 0x90728172, 0x88777277,
+- 0xb97902dc, 0x8879797f,
+- 0xbef80380, 0xbefe03c1,
+- 0x877c8179, 0xbf06817c,
+- 0xbf850002, 0xbeff0380,
+- 0xbf820001, 0xbeff03c1,
+- 0xb96f2a05, 0x806f816f,
+- 0x8f6f826f, 0x877c8179,
+- 0xbf06817c, 0xbf850013,
+- 0x8f76876f, 0xbef603ff,
+- 0x01000000, 0xbef20378,
+- 0x8078ff78, 0x00000080,
+- 0xbefc0381, 0xe0304000,
+- 0x785d0000, 0xbf8c3f70,
+- 0x7e008500, 0x807c817c,
+- 0x8078ff78, 0x00000080,
+- 0xbf0a6f7c, 0xbf85fff7,
+- 0xe0304000, 0x725d0000,
+- 0xbf820023, 0x8f76886f,
+- 0xbef603ff, 0x01000000,
+- 0xbef20378, 0x8078ff78,
+- 0x00000100, 0xbefc0381,
+- 0xe0304000, 0x785d0000,
+- 0xbf8c3f70, 0x7e008500,
+- 0x807c817c, 0x8078ff78,
+- 0x00000100, 0xbf0a6f7c,
+- 0xbf85fff7, 0xb96f1e06,
+- 0x876fc16f, 0xbf84000e,
+- 0x8f6f836f, 0x806f7c6f,
+- 0xbefe03c1, 0xbeff0380,
+- 0xe0304000, 0x785d0000,
+- 0xbf8c3f70, 0x7e008500,
+- 0x807c817c, 0x8078ff78,
+- 0x00000080, 0xbf0a6f7c,
+- 0xbf85fff7, 0xbeff03c1,
+- 0xe0304000, 0x725d0000,
+- 0x8772ff79, 0x04000000,
+- 0xbf840020, 0xbefe03c1,
+- 0x877c8179, 0xbf06817c,
+- 0xbf850002, 0xbeff0380,
+- 0xbf820001, 0xbeff03c1,
+- 0xb96f4306, 0x876fc16f,
+- 0xbf840016, 0x8f6f866f,
+- 0x8f6f826f, 0xbef6036f,
+- 0xbef603ff, 0x01000000,
+- 0x877c8172, 0xbf06817c,
+- 0xbefc0380, 0xbf850007,
+- 0x807cff7c, 0x00000080,
+- 0x8078ff78, 0x00000080,
+- 0xbf0a6f7c, 0xbf85fffa,
+- 0xbf820006, 0x807cff7c,
+- 0x00000100, 0x8078ff78,
+- 0x00000100, 0xbf0a6f7c,
+- 0xbf85fffa, 0x877c8179,
+- 0xbf06817c, 0xbf850003,
+- 0x8f7687ff, 0x0000006a,
+- 0xbf820002, 0x8f7688ff,
+- 0x0000006a, 0xbef603ff,
+- 0x01000000, 0x877c8179,
+- 0xbf06817c, 0xbf850012,
+- 0xf4211cba, 0xf0000000,
+- 0x8078ff78, 0x00000080,
+- 0xbefc0381, 0xf421003a,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xbf8cc07f,
+- 0xbe803000, 0xbf800000,
+- 0x807c817c, 0xbf0aff7c,
+- 0x0000006a, 0xbf85fff5,
+- 0xbe800372, 0xbf820011,
+- 0xf4211cba, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xbefc0381, 0xf421003a,
+- 0xf0000000, 0x8078ff78,
+- 0x00000100, 0xbf8cc07f,
+- 0xbe803000, 0xbf800000,
+- 0x807c817c, 0xbf0aff7c,
+- 0x0000006a, 0xbf85fff5,
+- 0xbe800372, 0xbef60384,
+- 0xbef603ff, 0x01000000,
+- 0x877c8179, 0xbf06817c,
+- 0xbf850025, 0xf4211bfa,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xf4211b3a,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xf4211b7a,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xf4211eba,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xf4211efa,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xf4211c3a,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xf4211c7a,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xf4211cfa,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xf4211e7a,
+- 0xf0000000, 0x8078ff78,
+- 0x00000080, 0xbf820024,
+- 0xf4211bfa, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xf4211b3a, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xf4211b7a, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xf4211eba, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xf4211efa, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xf4211c3a, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xf4211c7a, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xf4211cfa, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xf4211e7a, 0xf0000000,
+- 0x8078ff78, 0x00000100,
+- 0xbf8cc07f, 0x876dff6d,
+- 0x0000ffff, 0xbefc036f,
+- 0xbefe037a, 0xbeff037b,
+- 0x876f71ff, 0x000003ff,
+- 0xb9ef4803, 0xb9f3f816,
+- 0x876f71ff, 0xfffff800,
+- 0x906f8b6f, 0xb9efa2c3,
+- 0xb9f9f801, 0x876fff6d,
+- 0xf0000000, 0x906f9c6f,
+- 0x8f6f906f, 0xbef20380,
+- 0x88726f72, 0x876fff6d,
+- 0x08000000, 0x906f9b6f,
+- 0x8f6f8f6f, 0x88726f72,
+- 0x876fff70, 0x00800000,
+- 0x906f976f, 0xb9f2f807,
+- 0xb9f0f802, 0xbf8a0000,
+- 0xbe80226c, 0xbf810000,
+- 0xbf9f0000, 0xbf9f0000,
+- 0xbf9f0000, 0xbf9f0000,
+- 0xbf9f0000, 0x00000000,
+-};
++
+diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+index 510e3c4bfade..df350f081385 100644
+--- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c
++++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c
+@@ -29,7 +29,6 @@
+ #include "cwsr_trap_handler.h"
+ #include "kfd_iommu.h"
+ #include "amdgpu_amdkfd.h"
+-#include "cwsr_trap_handler_gfx10.asm"
+
+ #define MQD_SIZE_ALIGNED 768
+
+--
+2.17.1
+