diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:20:07 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-07-12 20:20:07 +0100 |
| commit | b2f3e45b252b412e220522adb6cf720ed2f1a4ae (patch) | |
| tree | 3b49dd6030f597037dc22282845f0c9a0a63daa5 /mali_kbase/mali_kbase_dummy_job_wa.c | |
| parent | f573fd96c0d6b6dfb2a91605a211dd15cb3153d4 (diff) | |
| parent | 2bfaaa5f53c45ab7b4f6daba20e92ef6d16ab53b (diff) | |
| download | gpu-b2f3e45b252b412e220522adb6cf720ed2f1a4ae.tar.gz | |
Merge r32p1-beta from upstream into android-gs-pixel-5.10
This commit updates the Mali KMD to version r32p1-beta from
commit 2bfaaa5f53c45ab7b4f6daba20e92ef6d16ab53b
Bug: 190388367
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ia2fa310b12eb95b0f3013c69ca821909d3fbf125
Diffstat (limited to 'mali_kbase/mali_kbase_dummy_job_wa.c')
| -rw-r--r-- | mali_kbase/mali_kbase_dummy_job_wa.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mali_kbase/mali_kbase_dummy_job_wa.c b/mali_kbase/mali_kbase_dummy_job_wa.c index b37b60e..0450acd 100644 --- a/mali_kbase/mali_kbase_dummy_job_wa.c +++ b/mali_kbase/mali_kbase_dummy_job_wa.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * - * (C) COPYRIGHT 2019-2020 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2019-2021 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 @@ -283,6 +283,8 @@ int kbase_dummy_job_wa_load(struct kbase_device *kbdev) int err; struct kbase_context *kctx; + lockdep_assert_held(&kbdev->fw_load_lock); + if (!wa_blob_load_needed(kbdev)) return 0; @@ -428,6 +430,10 @@ void kbase_dummy_job_wa_cleanup(struct kbase_device *kbdev) { struct kbase_context *wa_ctx; + /* return if the dummy job has not been loaded */ + if (kbdev->dummy_job_wa_loaded == false) + return; + /* Can be safely called even if the file wasn't created on probe */ sysfs_remove_file(&kbdev->dev->kobj, &dev_attr_dummy_job_wa_info.attr); |