diff options
| author | Vamsidhar reddy Gaddam <gvamsi@google.com> | 2024-02-05 10:13:04 +0000 |
|---|---|---|
| committer | Vamsidhar reddy Gaddam <gvamsi@google.com> | 2024-02-07 17:22:43 +0000 |
| commit | 88eb15d9c46c4992d178ce83216f97b8fb939cfe (patch) | |
| tree | 35a57b3c3b96dad46c007e852d144d5b334cb0f3 | |
| parent | a5801fb8227b719291fb7133491e9fc6b8444661 (diff) | |
| download | gpu-88eb15d9c46c4992d178ce83216f97b8fb939cfe.tar.gz | |
Clean-up left-over unnecessary stabiity fixes
This commit removes the following additions:
* SHA1: 76ee8a596d1df56bd958e2197abcc3e8b4849171
* SHA1: d6c306f413a32d460c310aab5c3f7f5449ed5599
* SHA1: 3a6116996ae69b28bd2f78093045582a1f06f71e
as none of them are required anymore and they interact poorly with DDK
upgrades.
Bug: 321195074
Test: Local & abtd
Change-Id: I7e4daf7bed82e4162413d7f38ce2a6d65172cbfe
Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
| -rw-r--r-- | mali_kbase/backend/gpu/mali_kbase_pm_driver.c | 6 | ||||
| -rw-r--r-- | mali_kbase/context/backend/mali_kbase_context_csf.c | 13 |
2 files changed, 3 insertions, 16 deletions
diff --git a/mali_kbase/backend/gpu/mali_kbase_pm_driver.c b/mali_kbase/backend/gpu/mali_kbase_pm_driver.c index 7871d67..142f819 100644 --- a/mali_kbase/backend/gpu/mali_kbase_pm_driver.c +++ b/mali_kbase/backend/gpu/mali_kbase_pm_driver.c @@ -147,8 +147,8 @@ bool kbase_pm_is_l2_desired(struct kbase_device *kbdev) return false; /* We need to power up the L2 when the MCU is desired */ - if (kbase_pm_is_mcu_desired(kbdev)) - return true; + if (likely(kbdev->csf.firmware_inited)) + return kbase_pm_is_mcu_desired(kbdev); #endif return kbdev->pm.backend.l2_desired; @@ -2300,7 +2300,7 @@ static bool kbase_pm_is_in_desired_state_nolock(struct kbase_device *kbdev) kbdev->pm.backend.shaders_state != KBASE_SHADERS_OFF_CORESTACK_OFF) in_desired_state = false; #else - in_desired_state &= kbase_pm_mcu_is_in_desired_state(kbdev); + in_desired_state = kbase_pm_mcu_is_in_desired_state(kbdev); #endif return in_desired_state; diff --git a/mali_kbase/context/backend/mali_kbase_context_csf.c b/mali_kbase/context/backend/mali_kbase_context_csf.c index a657b6d..17caa77 100644 --- a/mali_kbase/context/backend/mali_kbase_context_csf.c +++ b/mali_kbase/context/backend/mali_kbase_context_csf.c @@ -30,7 +30,6 @@ #include <mali_kbase_mem_pool_group.h> #include <mmu/mali_kbase_mmu.h> #include <tl/mali_kbase_timeline.h> -#include <backend/gpu/mali_kbase_pm_internal.h> #include <mali_kbase_ctx_sched.h> #if IS_ENABLED(CONFIG_DEBUG_FS) @@ -177,7 +176,6 @@ KBASE_EXPORT_SYMBOL(kbase_create_context); void kbase_destroy_context(struct kbase_context *kctx) { struct kbase_device *kbdev; - int err; if (WARN_ON(!kctx)) return; @@ -196,17 +194,6 @@ void kbase_destroy_context(struct kbase_context *kctx) dev_info(kbdev->dev, "Suspend in progress when destroying context"); wait_event(kbdev->pm.resume_wait, !kbase_pm_is_suspending(kbdev)); } - /* - * Taking a pm reference does not guarantee that the GPU has finished powering up. - * It's possible that the power up has been deferred until after a scheduled power down. - * We must wait here for the L2 to be powered up, and holding a pm reference guarantees that - * it will not be powered down afterwards. - */ - err = kbase_pm_wait_for_l2_powered(kbdev); - if (err) { - dev_err(kbdev->dev, "Wait for L2 power up failed on term of ctx %d_%d", - kctx->tgid, kctx->id); - } /* Have synchronized against the System suspend and incremented the * pm.active_count. So any subsequent invocation of System suspend |