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

drm/amdkfd Avoid destroy hqd when GPU is on reset 



This reverts commit 5161bba4311f 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 1b0bfcff ("drm/amdgpu: Avoid destroy hqd when GPU is on reset")

Originally, MEC is touched
without GPU initialized first.

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 4a06686b

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

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -3850,8 +3850,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)