diff options
| author |   Felix Kuehling <Felix.Kuehling@amd.com> | 2020-07-28 14:27:04 -0400 |
|---|---|---|
| committer |   Christian König <christian.koenig@amd.com> | 2020-07-30 13:55:28 +0200 |
| commit | c0001213d195d1bac83e0744c06ff06dd5a8ba53 (patch) | |
| tree | 7feaaa214e191a389cd34a4e8026bad1c15f3d84 /drivers/gpu/drm/ttm/ttm_bo_vm.c | |
| parent | Merge remote-tracking branch 'drm/drm-fixes' into drm-misc-fixes (diff) | |
| download | linux-dev-c0001213d195d1bac83e0744c06ff06dd5a8ba53.tar.xz linux-dev-c0001213d195d1bac83e0744c06ff06dd5a8ba53.zip | |
drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access
VMAs with a pg_offs that's offset from the start of the vma_node need
to adjust the offset within the BO accordingly. This matches the
offset calculation in ttm_bo_vm_fault_reserved.
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Tested-by: Laurent Morichetti <laurent.morichetti@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/381169/
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index fa03fab02076..33526c5df0e8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -505,8 +505,10 @@ static int ttm_bo_vm_access_kmap(struct ttm_buffer_object *bo, int ttm_bo_vm_access(struct vm_area_struct *vma, unsigned long addr, void *buf, int len, int write) { - unsigned long offset = (addr) - vma->vm_start; struct ttm_buffer_object *bo = vma->vm_private_data; + unsigned long offset = (addr) - vma->vm_start + + ((vma->vm_pgoff - drm_vma_node_start(&bo->base.vma_node)) + << PAGE_SHIFT); int ret; if (len < 1 || (offset + len) >> PAGE_SHIFT > bo->num_pages) |