drm/amdkfd Avoid destroy hqd when GPU is on reset
Subsystems (3)
PATCH 1/2 drm/amdkfd Avoid destroy hqd when GPU is on reset
This reverts commit 8a468ab2d in order to split it into two different patches, and this will make it easier to understand.
[PATCH 1/2]
porting to gfx10 from
commit 1b0bfcff463f390c4032ebe36a4d5fb777c00a4c
Originally, MEC is touched
without GPU initialized first.
Signed-off-by Jack Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 3 --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c +2 -2
@@ -543,8 +543,8 @@ 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 (adev->in_gpu_reset) +return -EIO ;#if 0 unsigned long flags;
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +0 -3
@@ -541,9 +541,6 @@ 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 +0 -2
@@ -3852,8 +3852,6 @@ 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)
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx