drm/rockchip: avoid duplicate mappings for IOMMU devices
Subsystems (4)
PATCH 1/1 drm/rockchip: avoid duplicate mappings for IOMMU devices
If a buffer is allocated with alloc_kmap, then it is vmap'd on creation and there is no reason to map it again in rockchip_gem_prime_vmap() when the existing mapping can be used.
Signed-off-by John Keeping <[email protected]>
--- drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/rockchip/rockchip_drm_gem.c +10 -3
@@ -519,8 +519,14 @@ int rockchip_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)struct rockchip_gem_object *rk_obj =to_rockchip_obj (obj);if (rk_obj->pages) { -void *vaddr =vmap (rk_obj->pages, rk_obj->num_pages,VM_MAP , -pgprot_writecombine (PAGE_KERNEL )); +void *vaddr; + +if (rk_obj->kvaddr) + vaddr = rk_obj->kvaddr; +else + vaddr =vmap (rk_obj->pages, rk_obj->num_pages,VM_MAP , +pgprot_writecombine (PAGE_KERNEL )); +if (!vaddr)return -ENOMEM ;iosys_map_set_vaddr (map, vaddr);
@@ -540,7 +546,8 @@ void rockchip_gem_prime_vunmap(struct drm_gem_object *obj,struct rockchip_gem_object *rk_obj =to_rockchip_obj (obj);if (rk_obj->pages) { -vunmap (map->vaddr); +if (map->vaddr != rk_obj->kvaddr) +vunmap (map->vaddr);return ; }
Signature · 1 line
2.38.1
Quoted 5 lines · John Keeping
If a buffer is allocated with
alloc_kmap, then it is vmap'd on creation and there is no reason to map it again inrockchip_gem_prime_vmap()when the existing mapping can be used.
Applied, thanks!
[1/1] drm/rockchip: avoid duplicate mappings for IOMMU devices
commit: 0020d4cfa3eea0e5fad23af49411217da854fc83
Best regards,
Signature · 1 line
Heiko Stuebner <[email protected]>