diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-06-17 17:58:22 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-06-17 17:58:22 +0100 |
| commit | 2bfaaa5f53c45ab7b4f6daba20e92ef6d16ab53b (patch) | |
| tree | 8cd2a6a47f2a590ed7bed11afdcb9e52f7232c4f /mali_kbase/backend/gpu/mali_kbase_pm_ca.c | |
| parent | fca8613cfcf585bf9113dca96a05daea9fd89794 (diff) | |
| download | gpu-2bfaaa5f53c45ab7b4f6daba20e92ef6d16ab53b.tar.gz | |
Mali Valhall DDK r32p1 BETA KMD
Provenance: 59f633569 (collaborate/google/android/v_r32p1-00bet0)
VX504X08X-BU-00000-r32p1-00bet0 - Valhall Android DDK
VX504X08X-BU-60000-r32p1-00bet0 - Valhall Android Document Bundle
VX504X08X-DC-11001-r32p1-00bet0 - Valhall Android DDK Software Errata
VX504X08X-SW-99006-r32p1-00bet0 - Valhall Android Renderscript AOSP parts
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: I6c9fc6e1e9f2e58bc804eb79582ad7afaafdef1b
Diffstat (limited to 'mali_kbase/backend/gpu/mali_kbase_pm_ca.c')
| -rw-r--r-- | mali_kbase/backend/gpu/mali_kbase_pm_ca.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mali_kbase/backend/gpu/mali_kbase_pm_ca.c b/mali_kbase/backend/gpu/mali_kbase_pm_ca.c index 3cf7608..8b7ca3e 100644 --- a/mali_kbase/backend/gpu/mali_kbase_pm_ca.c +++ b/mali_kbase/backend/gpu/mali_kbase_pm_ca.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * - * (C) COPYRIGHT 2013-2018, 2020 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2013-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 @@ -26,9 +26,6 @@ #include <mali_kbase.h> #include <mali_kbase_pm.h> #include <backend/gpu/mali_kbase_pm_internal.h> -#ifdef CONFIG_MALI_NO_MALI -#include <backend/gpu/mali_kbase_model_dummy.h> -#endif #include <mali_kbase_dummy_job_wa.h> int kbase_pm_ca_init(struct kbase_device *kbdev) @@ -123,9 +120,7 @@ u64 kbase_pm_ca_get_instr_core_mask(struct kbase_device *kbdev) { lockdep_assert_held(&kbdev->hwaccess_lock); -#ifdef CONFIG_MALI_NO_MALI - return (((1ull) << KBASE_DUMMY_MODEL_MAX_SHADER_CORES) - 1); -#elif MALI_USE_CSF +#if MALI_USE_CSF return kbase_pm_get_ready_cores(kbdev, KBASE_PM_CORE_SHADER); #else return kbdev->pm.backend.pm_shaders_core_mask; |