Commit 7ce55e0b authored by Jay Cornwall's avatar Jay Cornwall Committed by Alex Deucher
Browse files

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: default avatarJay Cornwall <jay.cornwall@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarshaoyunl <shaoyun.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f16d523f

drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h

+3 −3
Original line number Diff line number Diff line
@@ -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,

drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm

+3 −3
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE