* [PATCH] drm/rockchip: avoid duplicate mappings for IOMMU devices
@ 2022-11-10 17:24 John Keeping
2023-02-05 14:56 ` Heiko Stuebner
0 siblings, 1 reply; 2+ messages in thread
From: John Keeping @ 2022-11-10 17:24 UTC (permalink / raw)
To: Sandy Huang, Heiko Stübner
Cc: John Keeping, David Airlie, Daniel Vetter, dri-devel,
linux-arm-kernel, linux-rockchip, linux-kernel
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 <john@metanate.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index 6edb7c52cb3d..c9507d27f0ba 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -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;
}
--
2.38.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] drm/rockchip: avoid duplicate mappings for IOMMU devices
2022-11-10 17:24 [PATCH] drm/rockchip: avoid duplicate mappings for IOMMU devices John Keeping
@ 2023-02-05 14:56 ` Heiko Stuebner
0 siblings, 0 replies; 2+ messages in thread
From: Heiko Stuebner @ 2023-02-05 14:56 UTC (permalink / raw)
To: John Keeping, Sandy Huang
Cc: Heiko Stuebner, linux-kernel, linux-rockchip, David Airlie,
dri-devel, Daniel Vetter, linux-arm-kernel
On Thu, 10 Nov 2022 17:24:14 +0000, John Keeping wrote:
> 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.
>
>
Applied, thanks!
[1/1] drm/rockchip: avoid duplicate mappings for IOMMU devices
commit: 0020d4cfa3eea0e5fad23af49411217da854fc83
Best regards,
--
Heiko Stuebner <heiko@sntech.de>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-05 14:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-10 17:24 [PATCH] drm/rockchip: avoid duplicate mappings for IOMMU devices John Keeping
2023-02-05 14:56 ` Heiko Stuebner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®