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/mali_kbase_mem_linux.c | |
| 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/mali_kbase_mem_linux.c')
| -rw-r--r-- | mali_kbase/mali_kbase_mem_linux.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mali_kbase/mali_kbase_mem_linux.c b/mali_kbase/mali_kbase_mem_linux.c index 50effa9..8b00726 100644 --- a/mali_kbase/mali_kbase_mem_linux.c +++ b/mali_kbase/mali_kbase_mem_linux.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * * (C) COPYRIGHT 2010-2021 ARM Limited. All rights reserved. @@ -2711,7 +2711,7 @@ static int kbasep_reg_mmap(struct kbase_context *kctx, reg->nr_pages, 1) != 0) { dev_err(kctx->kbdev->dev, "%s:%d\n", __FILE__, __LINE__); /* Unable to map in GPU space. */ - WARN_ON_ONCE(1); /* TODO: b/162291137 */ + WARN_ON_ONCE(1); err = -ENOMEM; goto out; } |