Commit 8b35ce3f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-fixes-20231017' of... 

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: default avatarDave 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
parents 280bd84f dcc583c2

drivers/gpu/drm/mediatek/mtk_drm_gem.c

+5 −1
Original line number Diff line number Diff line
@@ -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;