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 --- drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 389128b8c4dd..60b41447bec8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -405,8 +405,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)
Am 28.07.20 um 20:27 schrieb Felix Kuehling:
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
Reviewed-by: Christian König christian.koenig@amd.com
Going to pick that up for inclusion in drm-misc-next.
drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 389128b8c4dd..60b41447bec8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -405,8 +405,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)
Am 2020-07-29 um 4:08 a.m. schrieb Christian König:
Am 28.07.20 um 20:27 schrieb Felix Kuehling:
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
Reviewed-by: Christian König christian.koenig@amd.com
Going to pick that up for inclusion in drm-misc-next.
Thanks. I'll submit it to amd-staging-drm-next so it makes its way into our DKMS branch quickly.
Alex, would you push this to drm-fixes?
Regards, Felix
drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 389128b8c4dd..60b41447bec8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -405,8 +405,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)
[AMD Public Use]
Christian, Can you cc stable when you apply it to drm-misc?
Alex ________________________________ From: Kuehling, Felix Felix.Kuehling@amd.com Sent: Wednesday, July 29, 2020 10:15 AM To: Koenig, Christian Christian.Koenig@amd.com; dri-devel@lists.freedesktop.org dri-devel@lists.freedesktop.org; amd-gfx@lists.freedesktop.org amd-gfx@lists.freedesktop.org; Deucher, Alexander Alexander.Deucher@amd.com Cc: Morichetti, Laurent Laurent.Morichetti@amd.com Subject: Re: [PATCH 1/1] drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access
Am 2020-07-29 um 4:08 a.m. schrieb Christian König:
Am 28.07.20 um 20:27 schrieb Felix Kuehling:
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
Reviewed-by: Christian König christian.koenig@amd.com
Going to pick that up for inclusion in drm-misc-next.
Thanks. I'll submit it to amd-staging-drm-next so it makes its way into our DKMS branch quickly.
Alex, would you push this to drm-fixes?
Regards, Felix
drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 389128b8c4dd..60b41447bec8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -405,8 +405,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)
Sure.
Christian.
Am 29.07.2020 17:30 schrieb "Deucher, Alexander" Alexander.Deucher@amd.com:
[AMD Public Use]
Christian, Can you cc stable when you apply it to drm-misc?
Alex ________________________________ From: Kuehling, Felix Felix.Kuehling@amd.com Sent: Wednesday, July 29, 2020 10:15 AM To: Koenig, Christian Christian.Koenig@amd.com; dri-devel@lists.freedesktop.org dri-devel@lists.freedesktop.org; amd-gfx@lists.freedesktop.org amd-gfx@lists.freedesktop.org; Deucher, Alexander Alexander.Deucher@amd.com Cc: Morichetti, Laurent Laurent.Morichetti@amd.com Subject: Re: [PATCH 1/1] drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access
Am 2020-07-29 um 4:08 a.m. schrieb Christian König:
Am 28.07.20 um 20:27 schrieb Felix Kuehling:
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
Reviewed-by: Christian König christian.koenig@amd.com
Going to pick that up for inclusion in drm-misc-next.
Thanks. I'll submit it to amd-staging-drm-next so it makes its way into our DKMS branch quickly.
Alex, would you push this to drm-fixes?
Regards, Felix
drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 389128b8c4dd..60b41447bec8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -405,8 +405,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)
On Wed, Jul 29, 2020 at 5:34 PM Koenig, Christian Christian.Koenig@amd.com wrote:
Sure.
Note that drm-misc-next isn't the right branch for cc: stable stuff, see
https://drm.pages.freedesktop.org/maintainer-tools/committer-drm-misc.html#w...
Just to avoid confusion and needless cherrypicking across branches. -Daniel
Christian.
Am 29.07.2020 17:30 schrieb "Deucher, Alexander" Alexander.Deucher@amd.com:
[AMD Public Use]
Christian, Can you cc stable when you apply it to drm-misc?
Alex ________________________________ From: Kuehling, Felix Felix.Kuehling@amd.com Sent: Wednesday, July 29, 2020 10:15 AM To: Koenig, Christian Christian.Koenig@amd.com; dri-devel@lists.freedesktop.org dri-devel@lists.freedesktop.org; amd-gfx@lists.freedesktop.org amd-gfx@lists.freedesktop.org; Deucher, Alexander Alexander.Deucher@amd.com Cc: Morichetti, Laurent Laurent.Morichetti@amd.com Subject: Re: [PATCH 1/1] drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access
Am 2020-07-29 um 4:08 a.m. schrieb Christian König:
Am 28.07.20 um 20:27 schrieb Felix Kuehling:
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
Reviewed-by: Christian König christian.koenig@amd.com
Going to pick that up for inclusion in drm-misc-next.
Thanks. I'll submit it to amd-staging-drm-next so it makes its way into our DKMS branch quickly.
Alex, would you push this to drm-fixes?
Regards, Felix
drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 389128b8c4dd..60b41447bec8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -405,8 +405,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)
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 30.07.20 um 13:40 schrieb Daniel Vetter:
On Wed, Jul 29, 2020 at 5:34 PM Koenig, Christian Christian.Koenig@amd.com wrote:
Sure.
Note that drm-misc-next isn't the right branch for cc: stable stuff, see
https://drm.pages.freedesktop.org/maintainer-tools/committer-drm-misc.html#w...
So this should go into drm-misc-fixes? The bug is there for quite a while.
Christian.
Just to avoid confusion and needless cherrypicking across branches. -Daniel
Christian.
Am 29.07.2020 17:30 schrieb "Deucher, Alexander" Alexander.Deucher@amd.com:
[AMD Public Use]
Christian, Can you cc stable when you apply it to drm-misc?
Alex ________________________________ From: Kuehling, Felix Felix.Kuehling@amd.com Sent: Wednesday, July 29, 2020 10:15 AM To: Koenig, Christian Christian.Koenig@amd.com; dri-devel@lists.freedesktop.org dri-devel@lists.freedesktop.org; amd-gfx@lists.freedesktop.org amd-gfx@lists.freedesktop.org; Deucher, Alexander Alexander.Deucher@amd.com Cc: Morichetti, Laurent Laurent.Morichetti@amd.com Subject: Re: [PATCH 1/1] drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access
Am 2020-07-29 um 4:08 a.m. schrieb Christian König:
Am 28.07.20 um 20:27 schrieb Felix Kuehling:
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
Reviewed-by: Christian König christian.koenig@amd.com
Going to pick that up for inclusion in drm-misc-next.
Thanks. I'll submit it to amd-staging-drm-next so it makes its way into our DKMS branch quickly.
Alex, would you push this to drm-fixes?
Regards, Felix
drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 389128b8c4dd..60b41447bec8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -405,8 +405,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)
dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 30.07.20 um 13:50 schrieb Christian König:
Am 30.07.20 um 13:40 schrieb Daniel Vetter:
On Wed, Jul 29, 2020 at 5:34 PM Koenig, Christian Christian.Koenig@amd.com wrote:
Sure.
Note that drm-misc-next isn't the right branch for cc: stable stuff, see
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fdrm.pages....
So this should go into drm-misc-fixes? The bug is there for quite a while.
Ok, so I pushed this to drm-misc-fixes, but forgot to add the CC stable tag.
To much to do and not enough time, Christian.
Christian.
Just to avoid confusion and needless cherrypicking across branches. -Daniel
Christian.
Am 29.07.2020 17:30 schrieb "Deucher, Alexander" Alexander.Deucher@amd.com:
[AMD Public Use]
Christian, Can you cc stable when you apply it to drm-misc?
Alex ________________________________ From: Kuehling, Felix Felix.Kuehling@amd.com Sent: Wednesday, July 29, 2020 10:15 AM To: Koenig, Christian Christian.Koenig@amd.com; dri-devel@lists.freedesktop.org dri-devel@lists.freedesktop.org; amd-gfx@lists.freedesktop.org amd-gfx@lists.freedesktop.org; Deucher, Alexander Alexander.Deucher@amd.com Cc: Morichetti, Laurent Laurent.Morichetti@amd.com Subject: Re: [PATCH 1/1] drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access
Am 2020-07-29 um 4:08 a.m. schrieb Christian König:
Am 28.07.20 um 20:27 schrieb Felix Kuehling:
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
Reviewed-by: Christian König christian.koenig@amd.com
Going to pick that up for inclusion in drm-misc-next.
Thanks. I'll submit it to amd-staging-drm-next so it makes its way into our DKMS branch quickly.
Alex, would you push this to drm-fixes?
Regards, Felix
drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c index 389128b8c4dd..60b41447bec8 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -405,8 +405,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)
dri-devel mailing list dri-devel@lists.freedesktop.org https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.free...
dri-devel@lists.freedesktop.org
-
Christian König -
Daniel Vetter -
Deucher, Alexander -
Felix Kuehling -
Felix Kuehling
-
Koenig, Christian