Convert to use vm_insert_range() to map range of kernel memory to user vma.
Signed-off-by: Souptick Joarder jrdr.linux@gmail.com --- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index a8db758..2cb83bb 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -221,26 +221,10 @@ static int rockchip_drm_gem_object_mmap_iommu(struct drm_gem_object *obj, struct vm_area_struct *vma) { struct rockchip_gem_object *rk_obj = to_rockchip_obj(obj); - unsigned int i, count = obj->size >> PAGE_SHIFT; unsigned long user_count = vma_pages(vma); - unsigned long uaddr = vma->vm_start; - unsigned long offset = vma->vm_pgoff; - unsigned long end = user_count + offset; - int ret; - - if (user_count == 0) - return -ENXIO; - if (end > count) - return -ENXIO;
- for (i = offset; i < end; i++) { - ret = vm_insert_page(vma, uaddr, rk_obj->pages[i]); - if (ret) - return ret; - uaddr += PAGE_SIZE; - } - - return 0; + return vm_insert_range(vma, vma->vm_start, rk_obj->pages, + user_count); }
static int rockchip_drm_gem_object_mmap_dma(struct drm_gem_object *obj,
Hi Heiko,
On Thu, Nov 15, 2018 at 9:14 PM Souptick Joarder jrdr.linux@gmail.com wrote:
Convert to use vm_insert_range() to map range of kernel memory to user vma.
Signed-off-by: Souptick Joarder jrdr.linux@gmail.com
Any feedback for this patch ?
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index a8db758..2cb83bb 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -221,26 +221,10 @@ static int rockchip_drm_gem_object_mmap_iommu(struct drm_gem_object *obj, struct vm_area_struct *vma) { struct rockchip_gem_object *rk_obj = to_rockchip_obj(obj);
unsigned int i, count = obj->size >> PAGE_SHIFT; unsigned long user_count = vma_pages(vma);
unsigned long uaddr = vma->vm_start;
unsigned long offset = vma->vm_pgoff;
unsigned long end = user_count + offset;
int ret;
if (user_count == 0)
return -ENXIO;
if (end > count)
return -ENXIO;
for (i = offset; i < end; i++) {
ret = vm_insert_page(vma, uaddr, rk_obj->pages[i]);
if (ret)
return ret;
uaddr += PAGE_SIZE;
}
return 0;
return vm_insert_range(vma, vma->vm_start, rk_obj->pages,
user_count);
}
static int rockchip_drm_gem_object_mmap_dma(struct drm_gem_object *obj,
1.9.1
Hi Souptick,
Am Montag, 26. November 2018, 06:36:42 CET schrieb Souptick Joarder:
On Thu, Nov 15, 2018 at 9:14 PM Souptick Joarder jrdr.linux@gmail.com
wrote:
Convert to use vm_insert_range() to map range of kernel memory to user vma.
Signed-off-by: Souptick Joarder jrdr.linux@gmail.com
Any feedback for this patch ?
sorry, took a bit longer to find time for a test-run.
Except the missing EXPORT_SYMBOL already pointed out in patch1, my displays are still working on modern (with iommu) and the older (without iommu) Rockchip socs, so
On rk3188, rk3288, rk3328 and rk3399 Tested-by: Heiko Stuebner heiko@sntech.de and in general Acked-by: Heiko Stuebner heiko@sntech.de
Heiko
On Wed, Nov 28, 2018 at 8:49 PM Heiko Stübner heiko@sntech.de wrote:
Hi Souptick,
Am Montag, 26. November 2018, 06:36:42 CET schrieb Souptick Joarder:
On Thu, Nov 15, 2018 at 9:14 PM Souptick Joarder jrdr.linux@gmail.com
wrote:
Convert to use vm_insert_range() to map range of kernel memory to user vma.
Signed-off-by: Souptick Joarder jrdr.linux@gmail.com
Any feedback for this patch ?
sorry, took a bit longer to find time for a test-run.
Except the missing EXPORT_SYMBOL already pointed out in patch1, my displays are still working on modern (with iommu) and the older (without iommu) Rockchip socs, so
On rk3188, rk3288, rk3328 and rk3399 Tested-by: Heiko Stuebner heiko@sntech.de and in general Acked-by: Heiko Stuebner heiko@sntech.de
Thanks Heiko.
Heiko
dri-devel@lists.freedesktop.org