Skip to content

Commit 3831989

Browse files
amd-jherichuangalexdeucher
authored andcommitted
drm/amdkfd: workaround address watch clearing bug for gfx v9.4.2
KFD currently relies on MEC FW to clear tcp watch control register on UNMAP_PROCESS, but FW doesn't work on it, which is a bug. So the solution is to clear the register as gfx v9 in KFD. Signed-off-by: Eric Huang <jinhuieric.huang@amd.com> Reviewed-by: Jonathan Kim <jonathan.kim@amd.com> Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 97c2eba commit 3831989

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,6 @@ static uint32_t kgd_gfx_aldebaran_set_address_watch(
163163
return watch_address_cntl;
164164
}
165165

166-
static uint32_t kgd_gfx_aldebaran_clear_address_watch(struct amdgpu_device *adev,
167-
uint32_t watch_id)
168-
{
169-
return 0;
170-
}
171-
172166
const struct kfd2kgd_calls aldebaran_kfd2kgd = {
173167
.program_sh_mem_settings = kgd_gfx_v9_program_sh_mem_settings,
174168
.set_pasid_vmid_mapping = kgd_gfx_v9_set_pasid_vmid_mapping,
@@ -193,7 +187,7 @@ const struct kfd2kgd_calls aldebaran_kfd2kgd = {
193187
.set_wave_launch_trap_override = kgd_aldebaran_set_wave_launch_trap_override,
194188
.set_wave_launch_mode = kgd_aldebaran_set_wave_launch_mode,
195189
.set_address_watch = kgd_gfx_aldebaran_set_address_watch,
196-
.clear_address_watch = kgd_gfx_aldebaran_clear_address_watch,
190+
.clear_address_watch = kgd_gfx_v9_clear_address_watch,
197191
.get_iq_wait_times = kgd_gfx_v9_get_iq_wait_times,
198192
.build_grace_period_packet_info = kgd_gfx_v9_build_grace_period_packet_info,
199193
.program_trap_handler_settings = kgd_gfx_v9_program_trap_handler_settings,

0 commit comments

Comments
 (0)