diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-04 18:33:46 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-04 18:33:46 -0800 |
| commit | fef47c9b159779b488690cab7253a25152c5f3f5 (patch) | |
| tree | 641bbb837975d41406511c05943a66bfc6e05bde | |
| parent | 9b22e4605050ca50a96b2aea31aa70e589697c41 (diff) | |
| parent | a5801fb8227b719291fb7133491e9fc6b8444661 (diff) | |
| download | gpu-fef47c9b159779b488690cab7253a25152c5f3f5.tar.gz | |
Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10
SBMerger: 603054162
Change-Id: Ifb4b3eabd13347ac888d117f2ebea44a07b4456f
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | mali_kbase/mali_kbase_config_defaults.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mali_kbase/mali_kbase_config_defaults.h b/mali_kbase/mali_kbase_config_defaults.h index edc22aa..1bedc6b 100644 --- a/mali_kbase/mali_kbase_config_defaults.h +++ b/mali_kbase/mali_kbase_config_defaults.h @@ -203,7 +203,8 @@ enum { * More cycles (1s @ 100Mhz = 100000000) are added up to ensure that * host timeout is always bigger than FW timeout. */ -#define CSF_CSG_SUSPEND_TIMEOUT_CYCLES (3100000000ull) +/* pixel: b/319408928 - CSF_CSG_SUSPEND_TIMEOUT_CYCLES is set to 2s@100MHz. */ +#define CSF_CSG_SUSPEND_TIMEOUT_CYCLES (200000000ull) /* Waiting timeout in clock cycles for GPU reset to complete. */ #define CSF_GPU_RESET_TIMEOUT_CYCLES (CSF_CSG_SUSPEND_TIMEOUT_CYCLES * 2) |