diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3161-drm-amdkfd-Fix-gfx10-wave64-VGPR-context-restore.patch')
| -rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3161-drm-amdkfd-Fix-gfx10-wave64-VGPR-context-restore.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3161-drm-amdkfd-Fix-gfx10-wave64-VGPR-context-restore.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3161-drm-amdkfd-Fix-gfx10-wave64-VGPR-context-restore.patch new file mode 100644 index 00000000..4c019e1e --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3161-drm-amdkfd-Fix-gfx10-wave64-VGPR-context-restore.patch @@ -0,0 +1,53 @@ +From 0979dea9621b3035b6a5f919920f75ea463b0b90 Mon Sep 17 00:00:00 2001 +From: Jay Cornwall <jay.cornwall@amd.com> +Date: Sun, 28 Jul 2019 15:24:40 -0500 +Subject: [PATCH 3161/4256] drm/amdkfd: Fix gfx10 wave64 VGPR context restore + +Copy/paste error, first 4 VGPRs are separated by 64 dwords (256 bytes). + +Cc: Shaoyun Liu <shaoyun.liu@amd.com> +Signed-off-by: Jay Cornwall <jay.cornwall@amd.com> +Acked-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: shaoyunl <shaoyun.liu@amd.com> +--- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 6 +++--- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +index 2b3d7017f142..c10e424dd1f5 100644 +--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h ++++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +@@ -982,9 +982,9 @@ static const uint32_t cwsr_trap_gfx10_hex[] = { + 0x00000080, 0xbf0a6f7c, + 0xbf85fff7, 0xbeff03c1, + 0xe0304000, 0x725d0000, +- 0xe0304080, 0x725d0100, +- 0xe0304100, 0x725d0200, +- 0xe0304180, 0x725d0300, ++ 0xe0304100, 0x725d0100, ++ 0xe0304200, 0x725d0200, ++ 0xe0304300, 0x725d0300, + 0xb9782a05, 0x80788178, + 0x907c9973, 0x877c817c, + 0xbf06817c, 0xbf850002, +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 261e05430852..be6f7d1847fa 100644 +--- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm ++++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +@@ -747,9 +747,9 @@ L_RESTORE_SHARED_VGPR_WAVE64_LOOP: + /* VGPR restore on v0 */ + L_RESTORE_V0: + buffer_load_dword v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 +- buffer_load_dword v1, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:128 +- buffer_load_dword v2, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:128*2 +- buffer_load_dword v3, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:128*3 ++ buffer_load_dword v1, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256 ++ buffer_load_dword v2, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256*2 ++ buffer_load_dword v3, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256*3 + + /* restore SGPRs */ + //will be 2+8+16*6 +-- +2.17.1 + |