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/jm | |
| 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/jm')
| -rw-r--r-- | mali_kbase/jm/mali_kbase_jm_defs.h | 2 | ||||
| -rw-r--r-- | mali_kbase/jm/mali_kbase_jm_js.h | 2 | ||||
| -rw-r--r-- | mali_kbase/jm/mali_kbase_js_defs.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mali_kbase/jm/mali_kbase_jm_defs.h b/mali_kbase/jm/mali_kbase_jm_defs.h index 2e22af1..fab42c3 100644 --- a/mali_kbase/jm/mali_kbase_jm_defs.h +++ b/mali_kbase/jm/mali_kbase_jm_defs.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. diff --git a/mali_kbase/jm/mali_kbase_jm_js.h b/mali_kbase/jm/mali_kbase_jm_js.h index e327536..5e0c4bc 100644 --- a/mali_kbase/jm/mali_kbase_jm_js.h +++ b/mali_kbase/jm/mali_kbase_jm_js.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * * (C) COPYRIGHT 2020-2021 ARM Limited. All rights reserved. diff --git a/mali_kbase/jm/mali_kbase_js_defs.h b/mali_kbase/jm/mali_kbase_js_defs.h index 095a042..75152fb 100644 --- a/mali_kbase/jm/mali_kbase_js_defs.h +++ b/mali_kbase/jm/mali_kbase_js_defs.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* * * (C) COPYRIGHT 2011-2018, 2020-2021 ARM Limited. All rights reserved. |