iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: cleanup amdgpu_hmm_range_get_pages

Browse Source 
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>
This commit is contained in:
Christian König
2022-11-09 12:41:08 +01:00
committed by Alex Deucher
parent d9483ecd32
commit d4cbff464d
4 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c
View File

@@ -158,10 +158,9 @@ void amdgpu_hmm_unregister(struct amdgpu_bo *bo)
} }
int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier, int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier,
struct mm_struct *mm, struct page **pages, uint64_t start, uint64_t npages, bool readonly,
uint64_t start, uint64_t npages, void *owner, struct page **pages,
struct hmm_range **phmm_range, bool readonly, struct hmm_range **phmm_range)
bool mmap_locked, void *owner)
{ {
struct hmm_range *hmm_range; struct hmm_range *hmm_range;
unsigned long timeout; unsigned long timeout;
@@ -194,14 +193,7 @@ int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier,
retry: retry:
hmm_range->notifier_seq = mmu_interval_read_begin(notifier); hmm_range->notifier_seq = mmu_interval_read_begin(notifier);
if (likely(!mmap_locked))
mmap_read_lock(mm);
r = hmm_range_fault(hmm_range); r = hmm_range_fault(hmm_range);
if (likely(!mmap_locked))
mmap_read_unlock(mm);
if (unlikely(r)) { if (unlikely(r)) {
/* /*
* FIXME: This timeout should encompass the retry from * FIXME: This timeout should encompass the retry from

7
drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.h
View File

@@ -31,10 +31,9 @@
#include <linux/interval_tree.h> #include <linux/interval_tree.h>
int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier, int amdgpu_hmm_range_get_pages(struct mmu_interval_notifier *notifier,
struct mm_struct *mm, struct page **pages, uint64_t start, uint64_t npages, bool readonly,
uint64_t start, uint64_t npages, void *owner, struct page **pages,
struct hmm_range **phmm_range, bool readonly, struct hmm_range **phmm_range);
bool mmap_locked, void *owner);
int amdgpu_hmm_range_get_pages_done(struct hmm_range *hmm_range); int amdgpu_hmm_range_get_pages_done(struct hmm_range *hmm_range);
#if defined(CONFIG_HMM_MIRROR) #if defined(CONFIG_HMM_MIRROR)

5
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
View File

@@ -692,9 +692,8 @@ int amdgpu_ttm_tt_get_user_pages(struct amdgpu_bo *bo, struct page **pages,
} }
readonly = amdgpu_ttm_tt_is_readonly(ttm); readonly = amdgpu_ttm_tt_is_readonly(ttm);
r = amdgpu_hmm_range_get_pages(&bo->notifier, mm, pages, start, r = amdgpu_hmm_range_get_pages(&bo->notifier, start, ttm->num_pages,
ttm->num_pages, range, readonly, readonly, NULL, pages, range);
true, NULL);
out_unlock: out_unlock:
mmap_read_unlock(mm); mmap_read_unlock(mm);
if (r) if (r)

6
drivers/gpu/drm/amd/amdkfd/kfd_svm.c
View File

@@ -1596,9 +1596,9 @@ static int svm_range_validate_and_map(struct mm_struct *mm,
next = min(vma->vm_end, end); next = min(vma->vm_end, end);
npages = (next - addr) >> PAGE_SHIFT; npages = (next - addr) >> PAGE_SHIFT;
WRITE_ONCE(p->svms.faulting_task, current); WRITE_ONCE(p->svms.faulting_task, current);
r = amdgpu_hmm_range_get_pages(&prange->notifier, mm, NULL, r = amdgpu_hmm_range_get_pages(&prange->notifier, addr, npages,
addr, npages, &hmm_range, readonly, owner, NULL,
readonly, true, owner); &hmm_range);
WRITE_ONCE(p->svms.faulting_task, NULL); WRITE_ONCE(p->svms.faulting_task, NULL);
if (r) { if (r) {
pr_debug("failed %d to get svm range pages\n", r); pr_debug("failed %d to get svm range pages\n", r);