diff options
| author | chenzhen <chenzhen@rock-chips.com> | 2016-08-31 15:15:20 +0800 |
|---|---|---|
| committer | Huang, Tao <huangtao@rock-chips.com> | 2016-09-13 13:59:01 +0800 |
| commit | 4fe5f7e659d7db140ae0bb5df16b444acaffe833 (patch) | |
| tree | 0549325366f101f15ce764bbf55974c385023f08 /drivers/gpu/arm/midgard/mali_kbase.h | |
| parent | f064782cc6750e31d178dc31d34b0ef3c8a5e8d7 (diff) | |
MALI: rockchip: upgrade midgard DDK to r13p0-00rel0
Conflicts:
drivers/gpu/arm/midgard/backend/gpu/mali_kbase_devfreq.c
drivers/gpu/arm/midgard/backend/gpu/mali_kbase_power_model_simple.c
drivers/gpu/arm/midgard/backend/gpu/mali_kbase_power_model_simple.h
drivers/gpu/arm/midgard/mali_kbase_defs.h
Change-Id: Ia7b8004b09ce31a5af6414c27b8ec776c247835a
Signed-off-by: chenzhen <chenzhen@rock-chips.com>
Diffstat (limited to 'drivers/gpu/arm/midgard/mali_kbase.h')
| -rw-r--r-- | drivers/gpu/arm/midgard/mali_kbase.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali_kbase.h index f09b30a3dff3..b6d28fea9987 100644 --- a/drivers/gpu/arm/midgard/mali_kbase.h +++ b/drivers/gpu/arm/midgard/mali_kbase.h @@ -175,7 +175,7 @@ void kbase_job_slot_softstop_swflags(struct kbase_device *kbdev, int js, void kbase_job_slot_hardstop(struct kbase_context *kctx, int js, struct kbase_jd_atom *target_katom); void kbase_job_check_enter_disjoint(struct kbase_device *kbdev, u32 action, - u16 core_reqs, struct kbase_jd_atom *target_katom); + base_jd_core_req core_reqs, struct kbase_jd_atom *target_katom); void kbase_job_check_leave_disjoint(struct kbase_device *kbdev, struct kbase_jd_atom *target_katom); @@ -193,15 +193,15 @@ void kbase_finish_soft_job(struct kbase_jd_atom *katom); void kbase_cancel_soft_job(struct kbase_jd_atom *katom); void kbase_resume_suspended_soft_jobs(struct kbase_device *kbdev); void kbasep_add_waiting_soft_job(struct kbase_jd_atom *katom); +void kbasep_remove_waiting_soft_job(struct kbase_jd_atom *katom); +int kbase_soft_event_update(struct kbase_context *kctx, + u64 event, + unsigned char new_status); bool kbase_replay_process(struct kbase_jd_atom *katom); -enum hrtimer_restart kbasep_soft_event_timeout_worker(struct hrtimer *timer); +void kbasep_soft_job_timeout_worker(unsigned long data); void kbasep_complete_triggered_soft_events(struct kbase_context *kctx, u64 evt); -int kbasep_read_soft_event_status( - struct kbase_context *kctx, u64 evt, unsigned char *status); -int kbasep_write_soft_event_status( - struct kbase_context *kctx, u64 evt, unsigned char new_status); /* api used internally for register access. Contains validation and tracing */ void kbase_device_trace_register_access(struct kbase_context *kctx, enum kbase_reg_access_type type, u16 reg_offset, u32 reg_value); |