Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu: cleanup amdgpu_hmm_range_get_pages

Remove unused parameters and cleanup dead code.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Christian König and committed by
Alex Deucher
d4cbff46 d9483ecd

+11 -21
+3 -11
drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
··· 158 158 } 159 159 160 160 int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier, 161 - struct mm_struct *mm, struct page **pages, 162 - uint64_t start, uint64_t npages, 163 - struct hmm_range **phmm_range, bool readonly, 164 - bool mmap_locked, void *owner) 161 + uint64_t start, uint64_t npages, bool readonly, 162 + void *owner, struct page **pages, 163 + struct hmm_range **phmm_range) 165 164 { 166 165 struct hmm_range *hmm_range; 167 166 unsigned long timeout; ··· 193 194 194 195 retry: 195 196 hmm_range->notifier_seq = mmu_interval_read_begin(notifier); 196 - 197 - if (likely(!mmap_locked)) 198 - mmap_read_lock(mm); 199 - 200 197 r = hmm_range_fault(hmm_range); 201 - 202 - if (likely(!mmap_locked)) 203 - mmap_read_unlock(mm); 204 198 if (unlikely(r)) { 205 199 /* 206 200 * FIXME: This timeout should encompass the retry from
+3 -4
drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.h
··· 31 31 #include <linux/interval_tree.h> 32 32 33 33 int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier, 34 - struct mm_struct *mm, struct page **pages, 35 - uint64_t start, uint64_t npages, 36 - struct hmm_range **phmm_range, bool readonly, 37 - bool mmap_locked, void *owner); 34 + uint64_t start, uint64_t npages, bool readonly, 35 + void *owner, struct page **pages, 36 + struct hmm_range **phmm_range); 38 37 int amdgpu_hmm_range_get_pages_done(struct hmm_range *hmm_range); 39 38 40 39 #if defined(CONFIG_HMM_MIRROR)
+2 -3
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
··· 692 692 } 693 693 694 694 readonly = amdgpu_ttm_tt_is_readonly(ttm); 695 - r = amdgpu_hmm_range_get_pages(&bo->notifier, mm, pages, start, 696 - ttm->num_pages, range, readonly, 697 - true, NULL); 695 + r = amdgpu_hmm_range_get_pages(&bo->notifier, start, ttm->num_pages, 696 + readonly, NULL, pages, range); 698 697 out_unlock: 699 698 mmap_read_unlock(mm); 700 699 if (r)
+3 -3
drivers/gpu/drm/amd/amdkfd/kfd_svm.c
··· 1596 1596 next = min(vma->vm_end, end); 1597 1597 npages = (next - addr) >> PAGE_SHIFT; 1598 1598 WRITE_ONCE(p->svms.faulting_task, current); 1599 - r = amdgpu_hmm_range_get_pages(&prange->notifier, mm, NULL, 1600 - addr, npages, &hmm_range, 1601 - readonly, true, owner); 1599 + r = amdgpu_hmm_range_get_pages(&prange->notifier, addr, npages, 1600 + readonly, owner, NULL, 1601 + &hmm_range); 1602 1602 WRITE_ONCE(p->svms.faulting_task, NULL); 1603 1603 if (r) { 1604 1604 pr_debug("failed %d to get svm range pages\n", r);