Commit e26305f3 authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdkfd: Fix rescheduling of restore worker 



Handle the case that the restore worker was already scheduled by another
eviction while the restore was in progress.

Fixes: 9a1c1339 ("drm/amdkfd: Run restore_workers on freezable WQs")
Signed-off-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Reviewed-by: default avatarPhilip Yang <Philip.Yang@amd.com>
Tested-by: default avatarYunxiang Li <Yunxiang.Li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent b0b13d53

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

+3 −3
Original line number Diff line number Diff line
@@ -2012,9 +2012,9 @@ static void restore_process_worker(struct work_struct *work) 
	if (ret) {

		pr_debug("Failed to restore BOs of pasid 0x%x, retry after %d ms\n",

			 p->pasid, PROCESS_BACK_OFF_TIME_MS);

		ret = queue_delayed_work(kfd_restore_wq, &p->restore_work,

				msecs_to_jiffies(PROCESS_BACK_OFF_TIME_MS));

		WARN(!ret, "reschedule restore work failed\n");

		if (mod_delayed_work(kfd_restore_wq, &p->restore_work,

				     msecs_to_jiffies(PROCESS_RESTORE_TIME_MS)))

			kfd_process_restore_queues(p);

	}

}