diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-07-21 21:44:43 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-07-21 21:45:39 +0100 |
| commit | 17749634b3f1e8e7c2fa4e04e65b778259e1ba86 (patch) | |
| tree | 486e85e32a45ac8cabe7a06dcbea12c504d0aa9f /mali_kbase/context | |
| parent | 7bdbdbf497a4745d24b857e9bd066845682885a0 (diff) | |
| parent | 52c5bf56aa5f18f0e0158998b8ac23bfc4cccad6 (diff) | |
| download | gpu-17749634b3f1e8e7c2fa4e04e65b778259e1ba86.tar.gz | |
Merge r32p1-beta2 from upstream into android-gs-pixel-5.10
This commit updates the Mali KMD to version r32p1-beta2 from
commit 52c5bf56aa5f18f0e0158998b8ac23bfc4cccad6
Bug: 186092835
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ie68303c73624067234aeb8756ad0835115380968
Diffstat (limited to 'mali_kbase/context')
| -rw-r--r-- | mali_kbase/context/Kbuild | 3 | ||||
| -rw-r--r-- | mali_kbase/context/backend/mali_kbase_context_csf.c | 2 | ||||
| -rw-r--r-- | mali_kbase/context/backend/mali_kbase_context_jm.c | 2 | ||||
| -rw-r--r-- | mali_kbase/context/mali_kbase_context.c | 2 | ||||
| -rw-r--r-- | mali_kbase/context/mali_kbase_context.h | 2 | ||||
| -rw-r--r-- | mali_kbase/context/mali_kbase_context_internal.h | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/mali_kbase/context/Kbuild b/mali_kbase/context/Kbuild index edce455..1d9c00a 100644 --- a/mali_kbase/context/Kbuild +++ b/mali_kbase/context/Kbuild @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: GPL-2.0 +# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note # # (C) COPYRIGHT 2012-2013, 2016-2017, 2020-2021 ARM Limited. All rights reserved. # @@ -25,4 +25,3 @@ ifeq ($(CONFIG_MALI_CSF_SUPPORT),y) else mali_kbase-y += context/backend/mali_kbase_context_jm.o endif - diff --git a/mali_kbase/context/backend/mali_kbase_context_csf.c b/mali_kbase/context/backend/mali_kbase_context_csf.c index fc74744..1ce806f 100644 --- a/mali_kbase/context/backend/mali_kbase_context_csf.c +++ b/mali_kbase/context/backend/mali_kbase_context_csf.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. diff --git a/mali_kbase/context/backend/mali_kbase_context_jm.c b/mali_kbase/context/backend/mali_kbase_context_jm.c index f41b919..e0e2b2c 100644 --- a/mali_kbase/context/backend/mali_kbase_context_jm.c +++ b/mali_kbase/context/backend/mali_kbase_context_jm.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. diff --git a/mali_kbase/context/mali_kbase_context.c b/mali_kbase/context/mali_kbase_context.c index 20142af..b2e7025 100644 --- a/mali_kbase/context/mali_kbase_context.c +++ b/mali_kbase/context/mali_kbase_context.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. diff --git a/mali_kbase/context/mali_kbase_context.h b/mali_kbase/context/mali_kbase_context.h index f7ee79d..a0c51c9 100644 --- a/mali_kbase/context/mali_kbase_context.h +++ b/mali_kbase/context/mali_kbase_context.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * * (C) COPYRIGHT 2011-2017, 2019-2021 ARM Limited. All rights reserved. diff --git a/mali_kbase/context/mali_kbase_context_internal.h b/mali_kbase/context/mali_kbase_context_internal.h index 75da8cf..1cde739 100644 --- a/mali_kbase/context/mali_kbase_context_internal.h +++ b/mali_kbase/context/mali_kbase_context_internal.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. |