diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-25 19:26:21 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-25 19:26:21 -0800 |
| commit | b9bace1836c9c418e14a75f9ab0e84cb12204282 (patch) | |
| tree | dd6a4ac6052b89184f33d041cd7df0bf0f5a1e6d | |
| parent | 0da6c91e4179f089a6513777c913ccab8d7d3d0e (diff) | |
| parent | 4e0c893e390a7415378a6ab9b0a72a68c35b6c86 (diff) | |
| download | gpu-b9bace1836c9c418e14a75f9ab0e84cb12204282.tar.gz | |
Merge android14-gs-pixel-5.15-24Q2 into android14-gs-pixel-5.15
SBMerger: 605678113
Change-Id: Id7f246e064aaa4af921b236c229ace8a521cbd20
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | mali_kbase/backend/gpu/mali_kbase_pm_driver.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mali_kbase/backend/gpu/mali_kbase_pm_driver.c b/mali_kbase/backend/gpu/mali_kbase_pm_driver.c index 69ced79..e97928b 100644 --- a/mali_kbase/backend/gpu/mali_kbase_pm_driver.c +++ b/mali_kbase/backend/gpu/mali_kbase_pm_driver.c @@ -1173,9 +1173,7 @@ static int kbase_pm_mcu_update_state(struct kbase_device *kbdev) break; case KBASE_MCU_POWER_DOWN: - // b/321195074 - Disabling the WA until regressions are - // resolved. - if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TITANHW_2922) && false) { + if (kbase_hw_has_issue(kbdev, BASE_HW_ISSUE_TITANHW_2922)) { if (!kbdev->csf.firmware_hctl_core_pwr) kbasep_pm_toggle_power_interrupt(kbdev, true); backend->mcu_state = KBASE_MCU_OFF; |