drm/amdgpu/sriov add amdgpu_amdkfd_pre_reset in gpu reset
[ Upstream commit 04bef61e5d
]
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: Jack Zhang <Jack.Zhang1@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
parent
644148cd15
commit
cb1dfad688
|
@ -644,6 +644,9 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, void *mqd,
|
||||||
uint32_t temp;
|
uint32_t temp;
|
||||||
struct v10_compute_mqd *m = get_mqd(mqd);
|
struct v10_compute_mqd *m = get_mqd(mqd);
|
||||||
|
|
||||||
|
if (amdgpu_sriov_vf(adev) && adev->in_gpu_reset)
|
||||||
|
return 0;
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int retry;
|
int retry;
|
||||||
|
|
|
@ -540,6 +540,9 @@ int kgd_gfx_v9_hqd_destroy(struct kgd_dev *kgd, void *mqd,
|
||||||
uint32_t temp;
|
uint32_t temp;
|
||||||
struct v9_mqd *m = get_mqd(mqd);
|
struct v9_mqd *m = get_mqd(mqd);
|
||||||
|
|
||||||
|
if (amdgpu_sriov_vf(adev) && adev->in_gpu_reset)
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (adev->in_gpu_reset)
|
if (adev->in_gpu_reset)
|
||||||
return -EIO;
|
return -EIO;
|
||||||
|
|
||||||
|
|
|
@ -3466,6 +3466,8 @@ static int amdgpu_device_reset_sriov(struct amdgpu_device *adev,
|
||||||
if (r)
|
if (r)
|
||||||
return r;
|
return r;
|
||||||
|
|
||||||
|
amdgpu_amdkfd_pre_reset(adev);
|
||||||
|
|
||||||
/* Resume IP prior to SMC */
|
/* Resume IP prior to SMC */
|
||||||
r = amdgpu_device_ip_reinit_early_sriov(adev);
|
r = amdgpu_device_ip_reinit_early_sriov(adev);
|
||||||
if (r)
|
if (r)
|
||||||
|
|
Loading…
Reference in New Issue