diff options
| author | Jörg Wagner <jorwag@google.com> | 2023-08-31 19:15:13 +0000 |
|---|---|---|
| committer | Jörg Wagner <jorwag@google.com> | 2023-09-01 09:13:55 +0000 |
| commit | b6fd708b3a4da86a196a61592ea3585f1aca7313 (patch) | |
| tree | 1cbe3029a45bf9869c17a5b6954e5ae074b44ac8 /mali_kbase/mali_kbase_kinstr_prfcnt.c | |
| parent | 46edf1b5965d872c5f8a09c6dc3dcbff58f78a92 (diff) | |
| parent | e61eb93296e9f940b32d4ad4b0c3a5557cbeaf17 (diff) | |
| download | gpu-b6fd708b3a4da86a196a61592ea3585f1aca7313.tar.gz | |
Merge r44p1-00dev3 from partner/upstream into android13-gs-pixel-5.10-udc-qpr1
Bug: 290882327
Change-Id: I90723cbaa3f294431087587fd8025f0688e51bf2
Diffstat (limited to 'mali_kbase/mali_kbase_kinstr_prfcnt.c')
| -rw-r--r-- | mali_kbase/mali_kbase_kinstr_prfcnt.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mali_kbase/mali_kbase_kinstr_prfcnt.c b/mali_kbase/mali_kbase_kinstr_prfcnt.c index cfafd11..f0c4da7 100644 --- a/mali_kbase/mali_kbase_kinstr_prfcnt.c +++ b/mali_kbase/mali_kbase_kinstr_prfcnt.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * - * (C) COPYRIGHT 2021-2022 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2021-2023 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 @@ -36,7 +36,6 @@ #include <linux/mutex.h> #include <linux/poll.h> #include <linux/slab.h> -#include <linux/overflow.h> #include <linux/version_compat_defs.h> #include <linux/workqueue.h> @@ -1267,8 +1266,10 @@ void kbase_kinstr_prfcnt_term(struct kbase_kinstr_prfcnt_context *kinstr_ctx) void kbase_kinstr_prfcnt_suspend(struct kbase_kinstr_prfcnt_context *kinstr_ctx) { - if (WARN_ON(!kinstr_ctx)) + if (!kinstr_ctx) { + pr_warn("%s: kinstr_ctx is NULL\n", __func__); return; + } mutex_lock(&kinstr_ctx->lock); @@ -1297,8 +1298,10 @@ void kbase_kinstr_prfcnt_suspend(struct kbase_kinstr_prfcnt_context *kinstr_ctx) void kbase_kinstr_prfcnt_resume(struct kbase_kinstr_prfcnt_context *kinstr_ctx) { - if (WARN_ON(!kinstr_ctx)) + if (!kinstr_ctx) { + pr_warn("%s: kinstr_ctx is NULL\n", __func__); return; + } mutex_lock(&kinstr_ctx->lock); |