Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bff418a2 authored by Shaoyun Liu's avatar Shaoyun Liu Committed by Oded Gabbay
Browse files

drm/amdgpu: Avoid invalidate tlbs when gpu is on reset 



Signed-off-by: default avatarShaoyun Liu <Shaoyun.Liu@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 951df6d9

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

+3 −0
Original line number Diff line number Diff line
@@ -886,6 +886,9 @@ static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid) 
	int vmid;

	unsigned int tmp;



	if (adev->in_gpu_reset)

		return -EIO;



	for (vmid = 0; vmid < 16; vmid++) {

		if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid))

			continue;

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

+3 −0
Original line number Diff line number Diff line
@@ -846,6 +846,9 @@ static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid) 
	int vmid;

	unsigned int tmp;



	if (adev->in_gpu_reset)

		return -EIO;



	for (vmid = 0; vmid < 16; vmid++) {

		if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid))

			continue;

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

+3 −0
Original line number Diff line number Diff line
@@ -867,6 +867,9 @@ static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid) 
	int vmid;

	struct amdgpu_ring *ring = &adev->gfx.kiq.ring;



	if (adev->in_gpu_reset)

		return -EIO;



	if (ring->ready)

		return invalidate_tlbs_with_kiq(adev, pasid);