iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mediatek DRM Fixes - 20231017

Browse Source 
1. Correctly free sg_table in gem prime vmap
 -----BEGIN PGP SIGNATURE-----
 
 iQJMBAABCgA2FiEEACwLKSDmq+9RDv5P4cpzo8lZTiQFAmUtxhoYHGNodW5rdWFu
 Zy5odUBrZXJuZWwub3JnAAoJEOHKc6PJWU4kUZUP/0vH9pilQAWzAKjn6Wx+bDEE
 V/HCkBKtwoNXpjHy5+p81rtdsGhJ3rHyLunWqVGjZcx8lxwL2S2EWpkitmlnoMuI
 4cYnkDCrFWp54gnVGiOZlAH8UdjjH/D1UzgN4FdLWdJbxLBhfEDtoN4Zrz264Jiz
 2u3ezmQToMGGBgPcOboPZzfIOwT8xqy7VMoMWbJ+pQxJvZzkaGHbpi+nPLzOwhSj
 aRT/1aKheI4JMmn6ZIzPNNfM0MvkE+taWlNYmi/VSEdoeA4ohd5y2w1TZufdYn13
 e2Zp7eRusxqecVe7Wmz78cr0ScLi0iaIeaOZTJ24zoCCGmBdmHWblUvxxAMLaeWW
 Q3LvE3SdWrQE9UMuxGV3TkUobSoIY7JHJ0pexmXQUzkf8PWgEpS1fDC0r0f62sVr
 k8ryjBDj7ayesiU9P0lnibeBwRAjanmDIKrsMfPtd9Tuc3yTgxtaTVcvofKOrr8/
 j/GPly9+gop2/Y/8kIE4tA69fk4yHCnHjaMV53sjB0ZT/uF59Lqxed2dQPwJ2Icw
 /aRZDAzUhmZQWybeNGzbJpF+zCV017vkAx9tU4Ew4gYmMnqXRooxa8KvmXc70iLI
 KB0J0+hfVHy/mYWO5t+RYhnb81ZPaO6LpjTdEvUwj+P01Y5UHskS1JpiNTx8/+tO
 3+BmGJl8/tNILIj3K+WR
 =/f0C
 -----END PGP SIGNATURE-----

Merge tag 'mediatek-drm-fixes-20231017' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux into drm-fixes

Mediatek DRM Fixes - 20231017

1. Correctly free sg_table in gem prime vmap

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20231016233659.3639-1-chunkuang.hu@kernel.org
This commit is contained in:
Dave Airlie 2023-10-20 14:23:25 +10:00
commit 8b35ce3f7a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/mediatek/mtk_drm_gem.c
View File

@ -239,6 +239,7 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
npages = obj->size >> PAGE_SHIFT;
mtk_gem->pages = kcalloc(npages, sizeof(*mtk_gem->pages), GFP_KERNEL);
if (!mtk_gem->pages) {
sg_free_table(sgt);
kfree(sgt);
return -ENOMEM;
}
@ -248,12 +249,15 @@ int mtk_drm_gem_prime_vmap(struct drm_gem_object *obj, struct iosys_map *map)
mtk_gem->kvaddr = vmap(mtk_gem->pages, npages, VM_MAP,
pgprot_writecombine(PAGE_KERNEL));
if (!mtk_gem->kvaddr) {
sg_free_table(sgt);
kfree(sgt);
kfree(mtk_gem->pages);
return -ENOMEM;
}
out:
sg_free_table(sgt);
kfree(sgt);
out:
iosys_map_set_vaddr(map, mtk_gem->kvaddr);
return 0;