diff options
| author | Jörg Wagner <jorwag@google.com> | 2023-08-31 19:15:13 +0000 |
|---|---|---|
| committer | Jörg Wagner <jorwag@google.com> | 2023-09-01 09:13:55 +0000 |
| commit | b6fd708b3a4da86a196a61592ea3585f1aca7313 (patch) | |
| tree | 1cbe3029a45bf9869c17a5b6954e5ae074b44ac8 /mali_kbase/mali_kbase_dummy_job_wa.c | |
| parent | 46edf1b5965d872c5f8a09c6dc3dcbff58f78a92 (diff) | |
| parent | e61eb93296e9f940b32d4ad4b0c3a5557cbeaf17 (diff) | |
| download | gpu-b6fd708b3a4da86a196a61592ea3585f1aca7313.tar.gz | |
Merge r44p1-00dev3 from partner/upstream into android13-gs-pixel-5.10-udc-qpr1
Bug: 290882327
Change-Id: I90723cbaa3f294431087587fd8025f0688e51bf2
Diffstat (limited to 'mali_kbase/mali_kbase_dummy_job_wa.c')
| -rw-r--r-- | mali_kbase/mali_kbase_dummy_job_wa.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mali_kbase/mali_kbase_dummy_job_wa.c b/mali_kbase/mali_kbase_dummy_job_wa.c index 35934b9..c3c6046 100644 --- a/mali_kbase/mali_kbase_dummy_job_wa.c +++ b/mali_kbase/mali_kbase_dummy_job_wa.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note /* * - * (C) COPYRIGHT 2019-2021 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2019-2023 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -183,9 +183,9 @@ int kbase_dummy_job_wa_execute(struct kbase_device *kbdev, u64 cores) if (kbdev->dummy_job_wa.flags & KBASE_DUMMY_JOB_WA_FLAG_WAIT_POWERUP) { /* wait for power-ups */ - wait(kbdev, SHADER_READY_LO, (cores & U32_MAX), true); + wait(kbdev, GPU_CONTROL_REG(SHADER_READY_LO), (cores & U32_MAX), true); if (cores >> 32) - wait(kbdev, SHADER_READY_HI, (cores >> 32), true); + wait(kbdev, GPU_CONTROL_REG(SHADER_READY_HI), (cores >> 32), true); } if (kbdev->dummy_job_wa.flags & KBASE_DUMMY_JOB_WA_FLAG_SERIALIZE) { @@ -218,11 +218,11 @@ int kbase_dummy_job_wa_execute(struct kbase_device *kbdev, u64 cores) kbase_reg_write(kbdev, SHADER_PWROFF_HI, (cores >> 32)); /* wait for power off complete */ - wait(kbdev, SHADER_READY_LO, (cores & U32_MAX), false); - wait(kbdev, SHADER_PWRTRANS_LO, (cores & U32_MAX), false); + wait(kbdev, GPU_CONTROL_REG(SHADER_READY_LO), (cores & U32_MAX), false); + wait(kbdev, GPU_CONTROL_REG(SHADER_PWRTRANS_LO), (cores & U32_MAX), false); if (cores >> 32) { - wait(kbdev, SHADER_READY_HI, (cores >> 32), false); - wait(kbdev, SHADER_PWRTRANS_HI, (cores >> 32), false); + wait(kbdev, GPU_CONTROL_REG(SHADER_READY_HI), (cores >> 32), false); + wait(kbdev, GPU_CONTROL_REG(SHADER_PWRTRANS_HI), (cores >> 32), false); } kbase_reg_write(kbdev, GPU_CONTROL_REG(GPU_IRQ_CLEAR), U32_MAX); } |