Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b54d201 authored by Eric Huang's avatar Eric Huang Committed by Alex Deucher
Browse files

drm/amdkfd: add RAS ECC event support (v3) 



RAS ECC event will combine with GPU reset event, due to
ECC interrupts are caused by uncorrectable error that triggers
GPU reset.

v2: Fix misleading-indentation warning
v3: fix build with CONFIG_HSA_AMD disabled

Signed-off-by: default avatarEric Huang <JinhuiEric.Huang@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0dee45a2

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

+4 −0
Original line number Diff line number Diff line
@@ -640,4 +640,8 @@ int kgd2kfd_post_reset(struct kfd_dev *kfd) 
void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry)

{

}



void kgd2kfd_set_sram_ecc_flag(struct kfd_dev *kfd)

{

}

#endif

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

+1 −0
Original line number Diff line number Diff line
@@ -229,5 +229,6 @@ int kgd2kfd_quiesce_mm(struct mm_struct *mm); 
int kgd2kfd_resume_mm(struct mm_struct *mm);

int kgd2kfd_schedule_evict_and_restore_process(struct mm_struct *mm,

					       struct dma_fence *fence);

void kgd2kfd_set_sram_ecc_flag(struct kfd_dev *kfd);



#endif /* AMDGPU_AMDKFD_H_INCLUDED */

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

+1 −0
Original line number Diff line number Diff line
@@ -4805,6 +4805,7 @@ static int gfx_v9_0_process_ras_data_cb(struct amdgpu_device *adev, 
		struct amdgpu_iv_entry *entry)

{

	/* TODO ue will trigger an interrupt. */

	kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);

	amdgpu_ras_reset_gpu(adev, 0);

	return AMDGPU_RAS_UE;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ static int gmc_v9_0_ecc_interrupt_state(struct amdgpu_device *adev, 
static int gmc_v9_0_process_ras_data_cb(struct amdgpu_device *adev,

		struct amdgpu_iv_entry *entry)

{

	kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);

	amdgpu_ras_reset_gpu(adev, 0);

	return AMDGPU_RAS_UE;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -1851,6 +1851,8 @@ static int sdma_v4_0_process_ras_data_cb(struct amdgpu_device *adev, 
		return 0;

	}



	kgd2kfd_set_sram_ecc_flag(adev->kfd.dev);



	amdgpu_ras_reset_gpu(adev, 0);



	return AMDGPU_RAS_UE;