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_js.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_js.c')
| -rw-r--r-- | mali_kbase/mali_kbase_js.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mali_kbase/mali_kbase_js.c b/mali_kbase/mali_kbase_js.c index 83e4351..f8524ed 100644 --- a/mali_kbase/mali_kbase_js.c +++ b/mali_kbase/mali_kbase_js.c @@ -6,7 +6,7 @@ * 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 - * */ /* @@ -2450,8 +2448,6 @@ static void kbase_js_evict_deps(struct kbase_context *kctx, KBASE_KATOM_FLAG_JSCTX_IN_X_DEP_LIST))) { /* Remove dependency.*/ x_dep->atom_flags &= ~KBASE_KATOM_FLAG_X_DEP_BLOCKED; - trace_sysgraph(SGR_DEP_RES, kctx->id, - kbase_jd_atom_id(kctx, x_dep)); dev_dbg(kctx->kbdev->dev, "Cleared X_DEP flag on atom %p\n", (void *)x_dep); @@ -3312,8 +3308,6 @@ struct kbase_jd_atom *kbase_js_complete_atom(struct kbase_jd_atom *katom, bool was_pullable = kbase_js_ctx_pullable(kctx, x_dep->slot_nr, false); x_dep->atom_flags &= ~KBASE_KATOM_FLAG_X_DEP_BLOCKED; - trace_sysgraph(SGR_DEP_RES, kctx->id, - kbase_jd_atom_id(katom->kctx, x_dep)); dev_dbg(kbdev->dev, "Cleared X_DEP flag on atom %p\n", (void *)x_dep); |