From: Jiaqi <shijiaqi_develop@163.com>
To: dri-devel@lists.freedesktop.org
Cc: Sandy Huang <hjc@rock-chips.com>,
Heiko Stuebner <heiko@sntech.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Philipp Zabel <p.zabel@pengutronix.de>,
linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 4/6] drm/rockchip: Fix vmap address caching in rockchip_gem_prime_vmap()
Date: Sat, 09 May 2026 16:33:52 +0800 [thread overview]
Message-ID: <177831563268.322716.16290375245774379615@163.com> (raw)
In-Reply-To: <177831560568.322716.7926332149561323511@163.com>
In rockchip_gem_prime_vmap(), when rk_obj->kvaddr is NULL, a new
vmap() is performed but the resulting virtual address is only stored in
the local variable 'vaddr', not saved to rk_obj->kvaddr.
This causes three problems:
1. Every subsequent prime_vmap call re-maps the same pages, wasting
kernel virtual address space and TLB resources.
2. If the gem object is freed before prime_vunmap is called (e.g., in
an error path), rockchip_gem_free_iommu() calls vunmap(rk_obj->kvaddr)
which is NULL, so the prime_vmap-created mapping is never freed.
3. Multiple concurrent mappings of the same object cannot be tracked.
Fix by saving the newly vmap()'d address to rk_obj->kvaddr so it can
be reused and properly cleaned up.
Signed-off-by: Jiaqi <shijiaqi_develop@163.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
index 8afabe2118a9..1234567890ab 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
@@ -520,6 +520,7 @@ int rockchip_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
if (!vaddr)
return -ENOMEM;
iosys_map_set_vaddr(map, vaddr);
+ rk_obj->kvaddr = vaddr;
return 0;
}
--
2.40.0
next prev parent reply other threads:[~2026-05-09 8:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-09 8:33 [PATCH v3 0/6] drm/rockchip: Fix error handling and resource leaks in Rockchip DRM drivers Jiaqi
2026-05-09 8:33 ` [PATCH v3 1/6] drm/rockchip: Fix of_node reference leak in rockchip_drm_encoder_set_crtc_endpoint_id() Jiaqi
2026-05-09 8:33 ` [PATCH v3 2/6] drm/rockchip: Fix dangling crtc->state in vop2_crtc_reset() Jiaqi
2026-05-09 8:33 ` [PATCH v3 3/6] drm/rockchip: Fix vop2_create_crtcs() error path cleanup in vop2_bind() Jiaqi
2026-05-09 8:33 ` Jiaqi [this message]
2026-05-09 8:33 ` [PATCH v3 5/6] drm/rockchip: Fix leaked vblank event in vop_crtc_atomic_disable() Jiaqi
2026-05-09 8:34 ` [PATCH v3 6/6] drm/rockchip: Check return value of cdn_dp_grf_write() in error path Jiaqi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=177831563268.322716.16290375245774379615@163.com \
--to=shijiaqi_develop@163.com \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=heiko@sntech.de \
--cc=hjc@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=p.zabel@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox