diff options
| author | Jörg Wagner <jorwag@google.com> | 2023-08-31 19:15:13 +0000 |
|---|---|---|
| committer | Jörg Wagner <jorwag@google.com> | 2023-09-01 09:13:55 +0000 |
| commit | b6fd708b3a4da86a196a61592ea3585f1aca7313 (patch) | |
| tree | 1cbe3029a45bf9869c17a5b6954e5ae074b44ac8 /mali_kbase/mali_kbase_softjobs.c | |
| parent | 46edf1b5965d872c5f8a09c6dc3dcbff58f78a92 (diff) | |
| parent | e61eb93296e9f940b32d4ad4b0c3a5557cbeaf17 (diff) | |
| download | gpu-b6fd708b3a4da86a196a61592ea3585f1aca7313.tar.gz | |
Merge r44p1-00dev3 from partner/upstream into android13-gs-pixel-5.10-udc-qpr1
Bug: 290882327
Change-Id: I90723cbaa3f294431087587fd8025f0688e51bf2
Diffstat (limited to 'mali_kbase/mali_kbase_softjobs.c')
| -rw-r--r-- | mali_kbase/mali_kbase_softjobs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mali_kbase/mali_kbase_softjobs.c b/mali_kbase/mali_kbase_softjobs.c index d65ff2d..0ad2bf8 100644 --- a/mali_kbase/mali_kbase_softjobs.c +++ b/mali_kbase/mali_kbase_softjobs.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * - * (C) COPYRIGHT 2011-2022 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2011-2023 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -41,6 +41,7 @@ #include <linux/kernel.h> #include <linux/cache.h> #include <linux/file.h> +#include <linux/version_compat_defs.h> #if !MALI_USE_CSF /** @@ -751,7 +752,7 @@ static void *dma_buf_kmap_page(struct kbase_mem_phy_alloc *gpu_alloc, if (page_index == page_num) { *page = sg_page_iter_page(&sg_iter); - return kmap(*page); + return kbase_kmap(*page); } page_index++; } @@ -797,14 +798,13 @@ static int kbase_mem_copy_from_extres(struct kbase_context *kctx, for (i = 0; i < buf_data->nr_extres_pages && target_page_nr < buf_data->nr_pages; i++) { struct page *pg = buf_data->extres_pages[i]; - void *extres_page = kmap(pg); - + void *extres_page = kbase_kmap(pg); if (extres_page) { ret = kbase_mem_copy_to_pinned_user_pages( pages, extres_page, &to_copy, buf_data->nr_pages, &target_page_nr, offset); - kunmap(pg); + kbase_kunmap(pg, extres_page); if (ret) goto out_unlock; } @@ -839,7 +839,7 @@ static int kbase_mem_copy_from_extres(struct kbase_context *kctx, &target_page_nr, offset); #if KERNEL_VERSION(5, 6, 0) <= LINUX_VERSION_CODE - kunmap(pg); + kbase_kunmap(pg, extres_page); #else dma_buf_kunmap(dma_buf, i, extres_page); #endif |