diff options
| author | Kevin DuBois <kevindubois@google.com> | 2023-02-15 21:42:37 +0000 |
|---|---|---|
| committer | Sean Callanan <spyffe@google.com> | 2023-02-16 03:12:08 +0000 |
| commit | 50c0ac999bcc7f2cfd186e4249d0caec1383c3a7 (patch) | |
| tree | c84256046133ec9d47e9126b50bd0a6bd2e2c0c4 /mali_kbase/backend | |
| parent | e8fa58acd3f48031ac6297e64ae996d430fa31d4 (diff) | |
| download | gpu-50c0ac999bcc7f2cfd186e4249d0caec1383c3a7.tar.gz | |
Revert "kbase: Powercycle mali to recover from a PM timeout"
Revert submission 2366782
Reason for revert: b/252072919
Reverted changes: /q/submissionid:2366782
Bug: 252072919
Change-Id: I1060f7543d37bb616a1b7c2464a0929a96774415
Diffstat (limited to 'mali_kbase/backend')
| -rw-r--r-- | mali_kbase/backend/gpu/mali_kbase_pm_driver.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/mali_kbase/backend/gpu/mali_kbase_pm_driver.c b/mali_kbase/backend/gpu/mali_kbase_pm_driver.c index 601e8f5..8b2779a 100644 --- a/mali_kbase/backend/gpu/mali_kbase_pm_driver.c +++ b/mali_kbase/backend/gpu/mali_kbase_pm_driver.c @@ -2416,22 +2416,8 @@ static void kbase_pm_timed_out(struct kbase_device *kbdev) dev_err(kbdev->dev, "Power transition timed out unexpectedly\n"); kbase_gpu_timeout_debug_message(kbdev); dev_err(kbdev->dev, "Sending reset to GPU - all running jobs will be lost\n"); - - /* pixel: If either: - * 1. L2/MCU power transition timed out, or, - * 2. kbase state machine fell out of sync with the hw state, - * a soft/hard reset (ie writing to SOFT/HARD_RESET regs) is insufficient to resume - * operation. - * - * Besides, Odin TRM advises against touching SOFT/HARD_RESET - * regs if L2_PWRTRANS is 1 to avoid undefined state. - * - * We have already lost work if we end up here, so send a powercycle to reset the hw, - * which is more reliable. - */ if (kbase_prepare_to_reset_gpu(kbdev, - RESET_FLAGS_HWC_UNRECOVERABLE_ERROR | - RESET_FLAGS_FORCE_PM_HW_RESET)) + RESET_FLAGS_HWC_UNRECOVERABLE_ERROR)) kbase_reset_gpu(kbdev); } @@ -3192,14 +3178,6 @@ static int kbase_pm_do_reset(struct kbase_device *kbdev) KBASE_TLSTREAM_JD_GPU_SOFT_RESET(kbdev, kbdev); -#if MALI_USE_CSF - if (kbdev->csf.reset.force_pm_hw_reset) { - dev_err(kbdev->dev, "Power Cycle reset mali"); - kbdev->csf.reset.force_pm_hw_reset = false; - return kbase_pm_hw_reset(kbdev); - } -#endif - if (kbdev->pm.backend.callback_soft_reset) { ret = kbdev->pm.backend.callback_soft_reset(kbdev); if (ret < 0) |