diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-04-20 15:26:53 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-04-20 15:26:53 +0100 |
| commit | c83c70ba70ef485dfa4337da1a651cc86124598b (patch) | |
| tree | 4cdfc1dd12e5076d7d33499accba3ba24ef49e30 /mali_kbase/mali_kbase_softjobs.c | |
| parent | ceb3ef011c8ef7ff646f48a10188ebcb53c14cde (diff) | |
| parent | 8037b534570814775d79aeddd06b76e5ee941f59 (diff) | |
| download | gpu-c83c70ba70ef485dfa4337da1a651cc86124598b.tar.gz | |
Merge r30p0 from upstream into android-gs-pixel-5.10
This commit updates the Mali KMD to version r30p0 from
commit 8037b534570814775d79aeddd06b76e5ee941f59
Bug: 180379272
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I703f1da43913fab5cb5ac704630418b72655dc41
Diffstat (limited to 'mali_kbase/mali_kbase_softjobs.c')
| -rw-r--r-- | mali_kbase/mali_kbase_softjobs.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mali_kbase/mali_kbase_softjobs.c b/mali_kbase/mali_kbase_softjobs.c index daa9b90..18736d8 100644 --- a/mali_kbase/mali_kbase_softjobs.c +++ b/mali_kbase/mali_kbase_softjobs.c @@ -1,12 +1,12 @@ // SPDX-License-Identifier: GPL-2.0 /* * - * (C) COPYRIGHT 2011-2020 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2011-2021 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 * Foundation, and any use by you of this program is subject to the terms - * of such GNU licence. + * of such GNU license. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,8 +17,6 @@ * along with this program; if not, you can access it online at * http://www.gnu.org/licenses/gpl-2.0.html. * - * SPDX-License-Identifier: GPL-2.0 - * */ #include <mali_kbase.h> @@ -44,9 +42,7 @@ #if !MALI_USE_CSF /** - * @file mali_kbase_softjobs.c - * - * This file implements the logic behind software only jobs that are + * DOC: This file implements the logic behind software only jobs that are * executed within the driver rather than being handed over to the GPU. */ @@ -137,7 +133,7 @@ static int kbase_dump_cpu_gpu_time(struct kbase_jd_atom *katom) void *user_result; struct timespec64 ts; struct base_dump_cpu_gpu_counters data; - u64 system_time; + u64 system_time = 0ULL; u64 cycle_counter; u64 jc = katom->jc; struct kbase_context *kctx = katom->kctx; @@ -833,7 +829,7 @@ int kbase_mem_copy_from_extres(struct kbase_context *kctx, dma_buf_kunmap(dma_buf, i, extres_page); #endif if (ret) - goto out_unlock; + break; } } dma_buf_end_cpu_access(dma_buf, @@ -1097,7 +1093,7 @@ static int kbase_jit_allocate_process(struct kbase_jd_atom *katom) } #if MALI_JIT_PRESSURE_LIMIT_BASE - /** + /* * If this is the only JIT_ALLOC atom in-flight or if JIT pressure limit * is disabled at the context scope, then bypass JIT pressure limit * logic in kbase_jit_allocate(). |