linux-stable.git/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c, branch v5.2.4

Revert "drm/amdgpu: replace get_user_pages with HMM mirror helpers"

2019-03-28T15:15:26+00:00

This reverts commit 915d3eecfa23693bac9e54cdacf84fb4efdcc5c4.

This depends on an HMM fix which is not upstream yet.

Signed-off-by: Alex Deucher

Revert "drm/amdgpu: fix HMM config dependency issue"

2019-03-28T15:15:03+00:00

This reverts commit 6b8f7e3dee7883084932bbdfce471a2960c6db5d.

This depends on an HMM fix which is not upstream yet.

Signed-off-by: Alex Deucher

Revert "drm/amdgpu: support userptr cross VMAs case with HMM"

2019-03-28T15:14:03+00:00

This reverts commit 5aeaccca30023c00d982dfa7bfd25b384523460a.

This depends on an HMM fix which is not upstream yet.

Signed-off-by: Alex Deucher

drm/amdgpu: support userptr cross VMAs case with HMM

2019-03-19T20:36:58+00:00

userptr may cross two VMAs if the forked child process (not call exec
after fork) malloc buffer, then free it, and then malloc larger size
buf, kerenl will create new VMA adjacent to old VMA which was cloned
from parent process, some pages of userptr are in the first VMA, the
rest pages are in the second VMA.

HMM expects range only have one VMA, loop over all VMAs in the address
range, create multiple ranges to handle this case. See
is_mergeable_anon_vma in mm/mmap.c for details.

Signed-off-by: Philip Yang 
Reviewed-by: Felix Kuehling 
Signed-off-by: Alex Deucher

drm/amdgpu: stop evicting busy PDs/PTs

2019-03-19T20:36:58+00:00

Otherwise we won't be able to cleanly handle page faults.

Signed-off-by: Christian König 
Reviewed-by: Chunming Zhou 
Signed-off-by: Alex Deucher

drm/ttm: Quick-test mmap offset in ttm_bo_mmap()

2019-03-19T20:03:53+00:00

A BO's address has to be at least the minimum offset. Sharing this
test in ttm_bo_mmap() removes code from drivers. A full buffer-address
validation is still done within drm_vma_offset_lockup_locked().

Signed-off-by: Thomas Zimmermann 
Reviewed-by: Christian König 
Acked-by: Hans de Goede 
Signed-off-by: Alex Deucher

drm/ttm: Remove file_page_offset parameter from ttm_bo_device_init()

2019-03-19T20:03:53+00:00

The parameter file_page_offset is a constant shared by all drivers. Just
replace it with the constant itself.

Signed-off-by: Thomas Zimmermann 
Reviewed-by: Christian König 
Acked-by: Hans de Goede 
Signed-off-by: Alex Deucher

drm/ttm: Define a single DRM_FILE_PAGE_OFFSET constant

2019-03-19T20:03:53+00:00

Most TTM drivers define the constant DRM_FILE_PAGE_OFFSET of the same
value. The only exception is vboxvideo, which is being converted to the
new offset by this patch. Unifying the constants in a single place
simplifies the driver code.

Signed-off-by: Thomas Zimmermann 
Reviewed-by: Christian König 
Acked-by: Hans de Goede 
Signed-off-by: Alex Deucher

drm/amdgpu: fix HMM config dependency issue

2019-03-19T20:03:49+00:00

Only select HMM_MIRROR will get kernel config dependency warnings
if CONFIG_HMM is missing in the config. Add depends on HMM will
solve the issue.

Add conditional compilation to fix compilation errors if HMM_MIRROR
is not enabled as HMM config is not enabled.

Remove unused function amdgpu_ttm_tt_mark_user_pages.

Signed-off-by: Philip Yang 
Reviewed-by: Felix Kuehling 
Signed-off-by: Alex Deucher

drm/amdgpu: replace get_user_pages with HMM mirror helpers

2019-03-19T20:03:45+00:00

Use HMM helper function hmm_vma_fault() to get physical pages backing
userptr and start CPU page table update track of those pages. Then use
hmm_vma_range_done() to check if those pages are updated before
amdgpu_cs_submit for gfx or before user queues are resumed for kfd.

If userptr pages are updated, for gfx, amdgpu_cs_ioctl will restart
from scratch, for kfd, restore worker is rescheduled to retry.

HMM simplify the CPU page table concurrent update check, so remove
guptasklock, mmu_invalidations, last_set_pages fields from
amdgpu_ttm_tt struct.

HMM does not pin the page (increase page ref count), so remove related
operations like release_pages(), put_page(), mark_page_dirty().

Signed-off-by: Philip Yang 
Reviewed-by: Felix Kuehling 
Reviewed-by: Christian König 
Signed-off-by: Alex Deucher