diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-10-23 18:20:06 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-10-23 18:20:06 +1000 |
| commit | 7cd62eab9babd1fed9c497141650b31168f4f430 (patch) | |
| tree | 85ef2122ca0d88b2b598f45eb071fcd1f4faa3d2 /drivers/gpu/drm/mediatek/mtk_drm_gem.c | |
| parent | 035fdc38c1f6ddce3544d8a489548e6cc4de508a (diff) | |
| parent | 05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 (diff) | |
| download | lwn-7cd62eab9babd1fed9c497141650b31168f4f430.tar.gz lwn-7cd62eab9babd1fed9c497141650b31168f4f430.zip | |
BackMerge tag 'v6.6-rc7' into drm-next
This is needed to add the msm pr which is based on a higher base.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/mediatek/mtk_drm_gem.c')
| -rw-r--r-- | drivers/gpu/drm/mediatek/mtk_drm_gem.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c index f6632a0fe509..4f2e3feabc0f 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c @@ -246,6 +246,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; } @@ -255,12 +256,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; |