Commit 04bef61e authored by Jack Zhang's avatar Jack Zhang Committed by Alex Deucher
Browse files

drm/amdgpu/sriov add amdgpu_amdkfd_pre_reset in gpu reset 



kfd_pre_reset will free mem_objs allocated by kfd_gtt_sa_allocate

Without this change, sriov tdr code path will never free those allocated
memories and get memory leak.

v2:add a bugfix for kiq ring test fail

Signed-off-by: default avatarJack Zhang <Jack.Zhang1@amd.com>
Reviewed-by: default avatarMonk Liu <monk.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 50dc581a

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

+3 −0
Original line number Diff line number Diff line
@@ -543,6 +543,9 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
	uint32_t temp;

	struct v10_compute_mqd *m = get_mqd(mqd);



	if (amdgpu_sriov_vf(adev) && adev->in_gpu_reset)

		return 0;



#if 0

	unsigned long flags;

	int retry;

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

+3 −0
Original line number Diff line number Diff line
@@ -541,6 +541,9 @@ int kgd_gfx_v9_hqd_destroy(struct kgd_dev *kgd, void *mqd, 
	uint32_t temp;

	struct v9_mqd *m = get_mqd(mqd);



	if (amdgpu_sriov_vf(adev) && adev->in_gpu_reset)

		return 0;



	if (adev->in_gpu_reset)

		return -EIO;

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

+2 −0
Original line number Diff line number Diff line
@@ -3852,6 +3852,8 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev, 
	if (r)

		return r;



	amdgpu_amdkfd_pre_reset(adev);



	/* Resume IP prior to SMC */

	r = amdgpu_device_ip_reinit_early_sriov(adev);

	if (r)