diff options
| author | Howie Chang <howiechang@google.com> | 2022-05-05 10:35:15 +0000 |
|---|---|---|
| committer | Howie Chang <howiechang@google.com> | 2022-05-05 11:06:09 +0000 |
| commit | 24f884bf5e86175b0da95df93f2f5764ce6dfb99 (patch) | |
| tree | 7902aba0b7594781880b3318dd960bd003eccb1d /mali_kbase/mmu | |
| parent | 5c0e96def2431a974e5662f807c4ce46ffc29782 (diff) | |
| download | gpu-24f884bf5e86175b0da95df93f2f5764ce6dfb99.tar.gz | |
Revert "mali_kbase: Ensure GPU L2 is up prior to MMU cmd"
This reverts commit fbcc5a4cc48796702f05ec311e9150c559a47c4e.
Reason for revert: b/231509259
Bug: 231509259
Change-Id: I102c03b1051dae20ea916e95a44ba55fd0a446b7
Signed-off-by: Howie Chang <howiechang@google.com>
Diffstat (limited to 'mali_kbase/mmu')
| -rw-r--r-- | mali_kbase/mmu/mali_kbase_mmu.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/mali_kbase/mmu/mali_kbase_mmu.c b/mali_kbase/mmu/mali_kbase_mmu.c index b1b5e55..91615b2 100644 --- a/mali_kbase/mmu/mali_kbase_mmu.c +++ b/mali_kbase/mmu/mali_kbase_mmu.c @@ -1895,17 +1895,13 @@ kbase_mmu_flush_invalidate_as(struct kbase_device *kbdev, struct kbase_as *as, return; } - /* - * 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. + /* There's a chance that we were the second thread to take a PM reference. + * In that case, the owner of the first reference may not have completed the + * L2 power up yet. + * We need to wait for that to complete before proceeding. */ - err = kbase_pm_wait_for_l2_powered(kbdev); - if (err) { - dev_err(kbdev->dev, "Wait for L2 power up failed, skipping MMU command"); - return; - } + WARN_ON_ONCE(!kbdev->pm.backend.l2_desired); + kbase_pm_wait_for_desired_state(kbdev); /* AS transaction begin */ mutex_lock(&kbdev->mmu_hw_mutex); |