diff options
| author | Jack Diver <diverj@google.com> | 2022-09-20 09:24:27 +0000 |
|---|---|---|
| committer | Kevin DuBois <kevindubois@google.com> | 2022-10-31 21:25:24 +0000 |
| commit | 6dcd9736cbf84712dd7073dab4aea256e30517c2 (patch) | |
| tree | 0bdfdcc3c70a6378c8265b03e3fba6b8120ffa21 /mali_kbase/mali_kbase_defs.h | |
| parent | 400a7da825b089478056a1b2755b97156108080a (diff) | |
| parent | c30533582604fe0365bc3ce4e9e8e19dec3109da (diff) | |
| download | gpu-6dcd9736cbf84712dd7073dab4aea256e30517c2.tar.gz | |
Merge r38p1 from upstream into partner/android13-gs-pixel-5.10-tm-qpr2
Bug: 228779790
Bug: 240184939
Bug: 240185324
Test: Boot to home
Test: SST run
Test: Camera, portrait, video record
Test: VK CTS dEQP-VK.protected_memory.stack#*
Test: CtsDisplayTestCases
Test: CtsOpenGLTestCases
Test: CtsSkQPTestCases
Test: CtsNativeHardwareTestCases
Test: CtsUiRenderingTestCases
Test: CtsGpuToolsHostTestCases
Test: CtsGpuProfilingDataTestCases
Test: CtsVrTestCases
Test: CtsCameraTestCases
Test: CtsDeqpTestCases
Signed-off-by: Jack Diver <diverj@google.com>
Change-Id: I555b0c61cd08c973aaf7f75dc92d0c7573fa7c91
Diffstat (limited to 'mali_kbase/mali_kbase_defs.h')
| -rw-r--r-- | mali_kbase/mali_kbase_defs.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/mali_kbase/mali_kbase_defs.h b/mali_kbase/mali_kbase_defs.h index df373cb..6c4e3e8 100644 --- a/mali_kbase/mali_kbase_defs.h +++ b/mali_kbase/mali_kbase_defs.h @@ -978,11 +978,8 @@ struct kbase_process { * @total_gpu_pages for both native and dma-buf imported * allocations. * @job_done_worker: Worker for job_done work. - * @job_done_worker_thread: Thread for job_done work. * @event_worker: Worker for event work. - * @event_worker_thread: Thread for event work. * @apc.worker: Worker for async power control work. - * @apc.thread: Thread for async power control work. * @apc.power_on_work: Work struct for powering on the GPU. * @apc.power_off_work: Work struct for powering off the GPU. * @apc.end_ts: The latest end timestamp to power off the GPU. @@ -1189,11 +1186,8 @@ struct kbase_device { #endif bool poweroff_pending; -#if (KERNEL_VERSION(4, 4, 0) <= LINUX_VERSION_CODE) bool infinite_cache_active_default; -#else - u32 infinite_cache_active_default; -#endif + struct kbase_mem_pool_group_config mem_pool_defaults; u32 current_gpu_coherency_mode; @@ -1242,9 +1236,7 @@ struct kbase_device { struct kbasep_js_device_data js_data; struct kthread_worker job_done_worker; - struct task_struct *job_done_worker_thread; struct kthread_worker event_worker; - struct task_struct *event_worker_thread; /* See KBASE_JS_*_PRIORITY_MODE for details. */ u32 js_ctx_scheduling_mode; @@ -1260,7 +1252,6 @@ struct kbase_device { struct { struct kthread_worker worker; - struct task_struct *thread; struct kthread_work power_on_work; struct kthread_work power_off_work; ktime_t end_ts; @@ -2042,5 +2033,7 @@ static inline u64 kbase_get_lock_region_min_size_log2(struct kbase_gpu_props con #define KBASE_CLEAN_CACHE_MAX_LOOPS 100000 /* Maximum number of loops polling the GPU for an AS command to complete before we assume the GPU has hung */ #define KBASE_AS_INACTIVE_MAX_LOOPS 100000 +/* Maximum number of loops polling the GPU PRFCNT_ACTIVE bit before we assume the GPU has hung */ +#define KBASE_PRFCNT_ACTIVE_MAX_LOOPS 100000000 #endif /* _KBASE_DEFS_H_ */ |