diff options
Diffstat (limited to 'drivers/gpu/arm/midgard/mali_kbase_js_defs.h')
| -rw-r--r-- | drivers/gpu/arm/midgard/mali_kbase_js_defs.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase_js_defs.h b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h index e1342045b394..04f7809f79d3 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_js_defs.h +++ b/drivers/gpu/arm/midgard/mali_kbase_js_defs.h @@ -1,6 +1,6 @@ /* * - * (C) COPYRIGHT 2011-2016 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2011-2015 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 @@ -348,9 +348,6 @@ struct kbasep_js_device_data { u32 cfs_ctx_runtime_init_slices; /**< Value for DEFAULT_JS_CFS_CTX_RUNTIME_INIT_SLICES */ u32 cfs_ctx_runtime_min_slices; /**< Value for DEFAULT_JS_CFS_CTX_RUNTIME_MIN_SLICES */ - /**< Value for JS_SOFT_JOB_TIMEOUT */ - atomic_t soft_job_timeout_ms; - /** List of suspended soft jobs */ struct list_head suspended_soft_jobs_list; @@ -405,7 +402,7 @@ struct kbasep_js_kctx_info { * * You may not access any of these members from IRQ context. */ - struct kbase_jsctx { + struct { struct mutex jsctx_mutex; /**< Job Scheduler Context lock */ /** Number of jobs <b>ready to run</b> - does \em not include the jobs waiting in |