diff options
| author | Sidath Senanayake <sidaths@google.com> | 2019-04-10 14:37:00 +0200 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2019-04-10 14:37:00 +0200 |
| commit | e972f6531ef8c9d01eae567f52db4f0fd37d1428 (patch) | |
| tree | 52df0c2e2665e00e4fe5822ddb50df1a72e24cd0 /mali_kbase/backend/gpu/mali_kbase_pm_ca.c | |
| parent | a970431fa55f99aba31ea4263fdc8e70019a9ccd (diff) | |
| download | gpu-e972f6531ef8c9d01eae567f52db4f0fd37d1428.tar.gz | |
Mali Bifrost DDK r17p0 KMD
Provenance:
789dfe7c7 (collaborate/EAC/b_r17p0)
BX304L01B-BU-00000-r17p0-01rel0
BX304L06A-BU-00000-r17p0-01rel0
BX304X07X-BU-00000-r17p0-01rel0
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Iff5bea2d96207a6e72d5e533e772c24a7adbdc31
Diffstat (limited to 'mali_kbase/backend/gpu/mali_kbase_pm_ca.c')
| -rw-r--r-- | mali_kbase/backend/gpu/mali_kbase_pm_ca.c | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/mali_kbase/backend/gpu/mali_kbase_pm_ca.c b/mali_kbase/backend/gpu/mali_kbase_pm_ca.c index 2cb9452..41f6429 100644 --- a/mali_kbase/backend/gpu/mali_kbase_pm_ca.c +++ b/mali_kbase/backend/gpu/mali_kbase_pm_ca.c @@ -27,6 +27,9 @@ #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 int kbase_pm_ca_init(struct kbase_device *kbdev) { @@ -75,15 +78,12 @@ unlock: u64 kbase_pm_ca_get_core_mask(struct kbase_device *kbdev) { +#ifdef CONFIG_MALI_DEVFREQ struct kbase_pm_backend_data *pm_backend = &kbdev->pm.backend; +#endif lockdep_assert_held(&kbdev->hwaccess_lock); - /* All cores must be enabled when instrumentation is in use */ - if (pm_backend->instr_enabled) - return kbdev->gpu_props.props.raw_props.shader_present & - kbdev->pm.debug_core_mask_all; - #ifdef CONFIG_MALI_DEVFREQ return pm_backend->ca_cores_enabled & kbdev->pm.debug_core_mask_all; #else @@ -94,14 +94,13 @@ u64 kbase_pm_ca_get_core_mask(struct kbase_device *kbdev) KBASE_EXPORT_TEST_API(kbase_pm_ca_get_core_mask); -void kbase_pm_ca_instr_enable(struct kbase_device *kbdev) +u64 kbase_pm_ca_get_instr_core_mask(struct kbase_device *kbdev) { lockdep_assert_held(&kbdev->hwaccess_lock); - kbdev->pm.backend.instr_enabled = true; -} -void kbase_pm_ca_instr_disable(struct kbase_device *kbdev) -{ - lockdep_assert_held(&kbdev->hwaccess_lock); - kbdev->pm.backend.instr_enabled = false; +#ifdef CONFIG_MALI_NO_MALI + return (((1ull) << KBASE_DUMMY_MODEL_MAX_SHADER_CORES) - 1); +#else + return kbdev->pm.backend.pm_shaders_core_mask; +#endif } |