Commit 8e2712e7 authored by shaoyunl's avatar shaoyunl Committed by Alex Deucher
Browse files

drm/amdgpu: Add kfd init_complete flag to check from amdgpu side 



amdgpu driver may be in reset state during init which will not initialize the kfd,
driver need to initialize the KFD after reset by check the flag

Signed-off-by: default avatarshaoyunl <shaoyun.liu@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 03597b47

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

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
					adev->doorbell_index.last_non_cp;

		}



		kgd2kfd_device_init(adev->kfd.dev, adev_to_drm(adev), &gpu_resources);

		adev->kfd.init_complete = kgd2kfd_device_init(adev->kfd.dev,

						adev_to_drm(adev), &gpu_resources);

	}

}

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

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct amdgpu_amdkfd_fence { 
struct amdgpu_kfd_dev {

	struct kfd_dev *dev;

	uint64_t vram_used;

	bool init_complete;

};



enum kgd_engine_type {

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

+8 −1
Original line number Diff line number Diff line
@@ -4838,6 +4838,13 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, 
		/* unlock kfd: SRIOV would do it separately */

		if (!need_emergency_restart && !amdgpu_sriov_vf(tmp_adev))

	                amdgpu_amdkfd_post_reset(tmp_adev);



		/* kfd_post_reset will do nothing if kfd device is not initialized,

		 * need to bring up kfd here if it's not be initialized before

		 */

		if (!adev->kfd.init_complete)

			amdgpu_amdkfd_device_init(adev);



		if (audio_suspended)

			amdgpu_device_resume_display_audio(tmp_adev);

		amdgpu_device_unlock_adev(tmp_adev);