diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-08-27 18:30:29 -0700 |
|---|---|---|
| committer | Pindar Yang <pindaryang@google.com> | 2023-08-28 05:15:44 +0000 |
| commit | 9ac077b4a7638004fbf40e33520c17d7ab024155 (patch) | |
| tree | 06ca8f182cf551e9c250391b492ea1a97a53940d | |
| parent | e950fd2ae546b6e16bce788dfdc111465a75fe8e (diff) | |
| parent | 662a6ec447752444340d113d6c4d5256930fb894 (diff) | |
| download | gpu-9ac077b4a7638004fbf40e33520c17d7ab024155.tar.gz | |
Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1
Bug: 292447561
SBMerger: 558810260
Change-Id: Ic618ad7008dfa915ff71de71bc205d9e219b7c34
Signed-off-by: Pindar Yang <pindaryang@google.com>
| -rw-r--r-- | mali_kbase/mmu/mali_kbase_mmu_hw_direct.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mali_kbase/mmu/mali_kbase_mmu_hw_direct.c b/mali_kbase/mmu/mali_kbase_mmu_hw_direct.c index 794d6d5..ecfa23d 100644 --- a/mali_kbase/mmu/mali_kbase_mmu_hw_direct.c +++ b/mali_kbase/mmu/mali_kbase_mmu_hw_direct.c @@ -222,7 +222,7 @@ static int write_cmd(struct kbase_device *kbdev, int as_nr, u32 cmd) #if MALI_USE_CSF && !IS_ENABLED(CONFIG_MALI_NO_MALI) static int wait_cores_power_trans_complete(struct kbase_device *kbdev) { -#define WAIT_TIMEOUT 1000 /* 1ms timeout */ +#define WAIT_TIMEOUT 50000 /* 50ms timeout */ #define DELAY_TIME_IN_US 1 const int max_iterations = WAIT_TIMEOUT; int loop; @@ -242,7 +242,9 @@ static int wait_cores_power_trans_complete(struct kbase_device *kbdev) } if (loop == max_iterations) { - dev_warn(kbdev->dev, "SHADER_PWRTRANS set for too long"); + dev_warn(kbdev->dev, "SHADER_PWRTRANS %08x%08x set for too long", + kbase_reg_read(kbdev, GPU_CONTROL_REG(SHADER_PWRTRANS_HI)), + kbase_reg_read(kbdev, GPU_CONTROL_REG(SHADER_PWRTRANS_LO))); return -ETIMEDOUT; } |