diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-03-26 19:14:06 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-03-26 19:14:07 -0700 |
| commit | 3486b00e408d5c8096dc8539c385b6a545085d29 (patch) | |
| tree | 6553b6bac1cb9ae1e0b8386c75307b53a8f8a1e1 /mali_kbase/backend | |
| parent | 8141064fa8984d1b2d25b9c4a84b5e5b7916b83b (diff) | |
| parent | fa73c81d4bf634ccc50a231e3f2108a9e7c75689 (diff) | |
| download | gpu-3486b00e408d5c8096dc8539c385b6a545085d29.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
SBMerger: 516612970
Change-Id: Ic3745d8ba6e262a0f971a80e3e304ce2cc91cc26
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
Diffstat (limited to 'mali_kbase/backend')
| -rw-r--r-- | mali_kbase/backend/gpu/mali_kbase_pm_driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mali_kbase/backend/gpu/mali_kbase_pm_driver.c b/mali_kbase/backend/gpu/mali_kbase_pm_driver.c index 2bfc27a..1f66d17 100644 --- a/mali_kbase/backend/gpu/mali_kbase_pm_driver.c +++ b/mali_kbase/backend/gpu/mali_kbase_pm_driver.c @@ -1276,9 +1276,9 @@ static int kbase_pm_l2_update_state(struct kbase_device *kbdev) switch (backend->l2_state) { case KBASE_L2_OFF: if (kbase_pm_is_l2_desired(kbdev)) { +#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) // Workaround: give a short pause here before starting L2 transition. udelay(200); -#if MALI_USE_CSF && defined(KBASE_PM_RUNTIME) /* Enable HW timer of IPA control before * L2 cache is powered-up. */ |