diff options
| author | chenzhen <chenzhen@rock-chips.com> | 2016-02-19 16:58:15 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2016-05-31 09:10:41 +0800 |
| commit | 206f372edef1825b246043ee114097e28130739c (patch) | |
| tree | 5e5ae0515b8f7f57770a2e00ff7d2cb62be47a70 /drivers/gpu/arm/midgard/mali_kbase_defs.h | |
| parent | c9a873e3ed4677ff5bae509e33941a67f7e7fced (diff) | |
MALI: rockchip: upgrade midgard DDK to r9p0-05rel0
Conflicts:
drivers/gpu/arm/midgard/Kconfig
Change-Id: Ib7975ebe959624bedd92f126768987f2e2f0f84b
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
Diffstat (limited to 'drivers/gpu/arm/midgard/mali_kbase_defs.h')
| -rw-r--r-- | drivers/gpu/arm/midgard/mali_kbase_defs.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase_defs.h b/drivers/gpu/arm/midgard/mali_kbase_defs.h index e5eae36d11af..0fc5ff95234e 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_defs.h +++ b/drivers/gpu/arm/midgard/mali_kbase_defs.h @@ -144,6 +144,8 @@ #define MIDGARD_MMU_TOPLEVEL 1 #endif +#define MIDGARD_MMU_BOTTOMLEVEL 3 + #define GROWABLE_FLAGS_REQUIRED (KBASE_REG_PF_GROW | KBASE_REG_GPU_WR) /** setting in kbase_context::as_nr that indicates it's invalid */ @@ -386,6 +388,9 @@ struct kbase_jd_atom { /* Pointer to atom that has cross-slot dependency on this atom */ struct kbase_jd_atom *x_post_dep; + /* The GPU's flush count recorded at the time of submission, used for + * the cache flush optimisation */ + u32 flush_id; struct kbase_jd_atom_backend backend; #ifdef CONFIG_DEBUG_FS @@ -934,10 +939,6 @@ struct kbase_device { struct list_head kctx_list; struct mutex kctx_list_lock; -#ifdef CONFIG_MALI_MIDGARD_RT_PM - struct delayed_work runtime_pm_workqueue; -#endif - #ifdef CONFIG_PM_DEVFREQ struct devfreq_dev_profile devfreq_profile; struct devfreq *devfreq; @@ -1216,6 +1217,9 @@ struct kbase_context { struct list_head completed_jobs; /* Number of work items currently pending on job_done_wq */ atomic_t work_count; + + /* true if context is counted in kbdev->js_data.nr_contexts_runnable */ + bool ctx_runnable_ref; }; enum kbase_reg_access_type { |