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 | e8fa58acd3f48031ac6297e64ae996d430fa31d4 (patch) | |
| tree | d88e19e18007e9133a7d18c82b68d9a385422be4 /mali_kbase/backend | |
| parent | c8b3d7c3a48fdac2dbcf3cc8875cc5ff2545423f (diff) | |
| download | gpu-e8fa58acd3f48031ac6297e64ae996d430fa31d4.tar.gz | |
Revert "mali_kbase: Unmask RESET_COMPLETED irq before resetting ..."
Revert submission 2366782
Reason for revert: b/252072919
Reverted changes: /q/submissionid:2366782
Bug: 252072919
Change-Id: I6ee1b26063aefaaec82b3e6bff1418ca067d6c51
Diffstat (limited to 'mali_kbase/backend')
| -rw-r--r-- | mali_kbase/backend/gpu/mali_kbase_pm_driver.c | 6 |
1 files changed, 3 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 77a9d31..601e8f5 100644 --- a/mali_kbase/backend/gpu/mali_kbase_pm_driver.c +++ b/mali_kbase/backend/gpu/mali_kbase_pm_driver.c @@ -3200,9 +3200,6 @@ static int kbase_pm_do_reset(struct kbase_device *kbdev) } #endif - /* Unmask the reset complete interrupt only */ - kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), RESET_COMPLETED); - if (kbdev->pm.backend.callback_soft_reset) { ret = kbdev->pm.backend.callback_soft_reset(kbdev); if (ret < 0) @@ -3214,6 +3211,9 @@ static int kbase_pm_do_reset(struct kbase_device *kbdev) GPU_COMMAND_SOFT_RESET); } + /* Unmask the reset complete interrupt only */ + kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_MASK), RESET_COMPLETED); + /* Initialize a structure for tracking the status of the reset */ rtdata.kbdev = kbdev; rtdata.timed_out = false; |