From 83f520bbb6648732ee0329d218cb007ed58680cd Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Fri, 15 Jan 2016 16:19:12 -0500 Subject: [PATCH 0825/4131] drm/amdgpu: Make amdgpu_ttm_tt_get_user_pages work in kernel thread For HSA userptr support, a kernel worker thread must be able to re-pin a userptr BO after an MMU notifier unpinned it. Store the user task_struct in amdgpu_ttm_tt and use that task and its mm_struct instead of the current thread's. Change-Id: I3ba20fc9c489ad598c9706cf0b64231a18a0ec9f Signed-off-by: Felix Kuehling --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index a80d9cb..f81146b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -657,7 +657,7 @@ struct amdgpu_ttm_tt { struct amdgpu_device *adev; u64 offset; uint64_t userptr; - struct mm_struct *usermm; + struct task_struct *usertask; uint32_t userflags; spinlock_t guptasklock; struct list_head guptasks; @@ -681,7 +681,7 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) unsigned long end = gtt->userptr + ttm->num_pages * PAGE_SIZE; struct vm_area_struct *vma; - vma = find_vma(gtt->usermm, gtt->userptr); + vma = find_vma(gtt->usertask->mm, gtt->userptr); if (!vma || vma->vm_file || vma->vm_end < end) return -EPERM; } @@ -1041,7 +1041,7 @@ int amdgpu_ttm_tt_set_userptr(struct ttm_tt *ttm, uint64_t addr, return -EINVAL; gtt->userptr = addr; - gtt->usermm = current->mm; + gtt->usertask = current; gtt->userflags = flags; spin_lock_init(>t->guptasklock); INIT_LIST_HEAD(>t->guptasks); -- 2.7.4