Commit 96316211 authored by Yifan Zhang's avatar Yifan Zhang Committed by Alex Deucher
Browse files

drm/amdkfd: Don't drain ih1 for APU 



ih1 is not initialized for APUs. Don't drain it or NULL pointer
error will be triggered.

Fixes: 6ef29715 ("drm/amdkfd: Change kfd/svm page fault drain handling")
Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1125f95c

drivers/gpu/drm/amd/amdkfd/kfd_svm.c

+8 −5
Original line number Diff line number Diff line
@@ -2464,12 +2464,15 @@ svm_range_unmap_from_cpu(struct mm_struct *mm, struct svm_range *prange, 
		adev = pdd->dev->adev;



		/* Check and drain ih1 ring if cam not available */

		if (adev->irq.ih1.ring_size) {

			ih = &adev->irq.ih1;

			checkpoint_wptr = amdgpu_ih_get_wptr(adev, ih);

			if (ih->rptr != checkpoint_wptr) {

			svms->checkpoint_ts[i] = amdgpu_ih_decode_iv_ts(adev, ih, checkpoint_wptr, -1);

				svms->checkpoint_ts[i] =

					amdgpu_ih_decode_iv_ts(adev, ih, checkpoint_wptr, -1);

				continue;

			}

		}



		/* check if dev->irq.ih_soft is not empty */

		ih = &adev->irq.ih_soft;