Merge tag 'for-linus-hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-block.git] / drivers / gpu / drm / amd / amdkfd / kfd_process.c

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
index e5e326f2f2675edc88dce8eede0a93a33d2cc4ae..40e3fc0c6942120b83e724038a537ed11f756e9f 100644 (file)
--- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c
@@ -795,6 +795,8 @@ int kfd_process_device_init_vm(struct kfd_process_device *pdd,
                return ret;
        }
 
+       amdgpu_vm_set_task_info(pdd->vm);
+
        ret = kfd_process_device_reserve_ib_mem(pdd);
        if (ret)
                goto err_reserve_ib_mem;
@@ -1036,7 +1038,6 @@ static void restore_process_worker(struct work_struct *work)
 {
        struct delayed_work *dwork;
        struct kfd_process *p;
-       struct kfd_process_device *pdd;
        int ret = 0;
 
        dwork = to_delayed_work(work);
@@ -1045,16 +1046,6 @@ static void restore_process_worker(struct work_struct *work)
         * lifetime of this thread, kfd_process p will be valid
         */
        p = container_of(dwork, struct kfd_process, restore_work);
-
-       /* Call restore_process_bos on the first KGD device. This function
-        * takes care of restoring the whole process including other devices.
-        * Restore can fail if enough memory is not available. If so,
-        * reschedule again.
-        */
-       pdd = list_first_entry(&p->per_device_data,
-                              struct kfd_process_device,
-                              per_device_list);
-
        pr_debug("Started restoring pasid %d\n", p->pasid);
 
        /* Setting last_restore_timestamp before successful restoration.