diff options
author | Jack Diver <diverj@google.com> | 2024-03-13 16:33:34 +0000 |
---|---|---|
committer | Jack Diver <diverj@google.com> | 2024-03-14 10:13:41 +0000 |
commit | fd025f58ca46a4f88ce645c3f5649bd4a35b22e4 (patch) | |
tree | 5369327207cdf22eb10fb0f8bd84940e67ab6297 | |
parent | cdce8efe7fc9a58b68843ce2f4c39186bf7b6750 (diff) | |
download | gpu-fd025f58ca46a4f88ce645c3f5649bd4a35b22e4.tar.gz |
[DO NOT MERGE ANYWHERE] Revert "mali_kbase: platform: Add additional platform hooks"
Revert submission 2753879-gpu-slcv2-gs201
Reason for revert: Prebuild did not land before cutoff
Reverted changes: /q/submissionid:2753879-gpu-slcv2-gs201
Bug: 329447972
Change-Id: I24e2d118d0b3dfce52791c74825ddd150d56f660
-rw-r--r-- | mali_kbase/mali_kbase_config.c | 18 | ||||
-rw-r--r-- | mali_kbase/mali_kbase_config.h | 36 | ||||
-rw-r--r-- | mali_kbase/mali_kbase_ctx_sched.c | 2 |
3 files changed, 0 insertions, 56 deletions
diff --git a/mali_kbase/mali_kbase_config.c b/mali_kbase/mali_kbase_config.c index 72080a7..32f404b 100644 --- a/mali_kbase/mali_kbase_config.c +++ b/mali_kbase/mali_kbase_config.c @@ -83,24 +83,6 @@ void kbasep_platform_context_term(struct kbase_context *kctx) platform_funcs_p->platform_handler_context_term_func(kctx); } -void kbasep_platform_context_active(struct kbase_context *kctx) -{ - struct kbase_platform_funcs_conf *platform_funcs_p; - - platform_funcs_p = (struct kbase_platform_funcs_conf*)PLATFORM_FUNCS; - if (platform_funcs_p && platform_funcs_p->platform_handler_context_active) - platform_funcs_p->platform_handler_context_active(kctx); -} - -void kbasep_platform_context_idle(struct kbase_context *kctx) -{ - struct kbase_platform_funcs_conf *platform_funcs_p; - - platform_funcs_p = (struct kbase_platform_funcs_conf*)PLATFORM_FUNCS; - if (platform_funcs_p && platform_funcs_p->platform_handler_context_idle) - platform_funcs_p->platform_handler_context_idle(kctx); -} - void kbasep_platform_event_work_begin(void *param) { struct kbase_platform_funcs_conf *platform_funcs_p; diff --git a/mali_kbase/mali_kbase_config.h b/mali_kbase/mali_kbase_config.h index 7f6d3ed..c7a6b32 100644 --- a/mali_kbase/mali_kbase_config.h +++ b/mali_kbase/mali_kbase_config.h @@ -121,23 +121,6 @@ struct kbase_platform_funcs_conf { */ void (*platform_handler_context_term_func)(struct kbase_context *kctx); /** - * platform_handler_context_active - Platform specific handler, called when a context is - * (re)activated. - * - * @kctx: kbase_context pointer - * - * Context: Atomic context - */ - void (*platform_handler_context_active)(struct kbase_context *kctx); - /** - * platform_handler_context_idle - Platform specific handler, called when a context is idled. - * - * @kctx: kbase_context pointer - * - * Context: Atomic context - */ - void (*platform_handler_context_idle)(struct kbase_context *kctx); - /** * platform_handler_work_begin_func - Platform specific handler whose * function changes depending on the * backend used. @@ -582,25 +565,6 @@ int kbasep_platform_context_init(struct kbase_context *kctx); void kbasep_platform_context_term(struct kbase_context *kctx); /** - * kbasep_platform_context_active - Platform specific callback, called when a context is - * (re)activated. - * - * @kctx: kbase_context pointer - * - * Function calls a platform defined routine if specified in the configuration attributes. - */ -void kbasep_platform_context_active(struct kbase_context *kctx); - -/** - * kbasep_platform_context_idle - Platform specific callback, called when a context is idled. - * - * @kctx: kbase_context pointer - * - * Function calls a platform defined routine if specified in the configuration attributes. - */ -void kbasep_platform_context_idle(struct kbase_context *kctx); - -/** * kbasep_platform_event_work_begin - Platform specific callback whose function * changes depending on the backend used. * Signals that a unit of work has started diff --git a/mali_kbase/mali_kbase_ctx_sched.c b/mali_kbase/mali_kbase_ctx_sched.c index 8c3d52e..41f8c9c 100644 --- a/mali_kbase/mali_kbase_ctx_sched.c +++ b/mali_kbase/mali_kbase_ctx_sched.c @@ -118,7 +118,6 @@ int kbase_ctx_sched_retain_ctx(struct kbase_context *kctx) if (free_as >= 0) { kbdev->as_free &= ~(1u << free_as); - kbasep_platform_context_active(kctx); /* Only program the MMU if the context has not been * assigned the same address space before. */ @@ -186,7 +185,6 @@ void kbase_ctx_sched_release_ctx(struct kbase_context *kctx) new_ref_count = atomic_dec_return(&kctx->refcount); if (new_ref_count == 0) { - kbasep_platform_context_idle(kctx); if (likely((kctx->as_nr >= 0) && (kctx->as_nr < BASE_MAX_NR_AS))) { kbdev->as_free |= (1u << kctx->as_nr); if (kbase_ctx_flag(kctx, KCTX_AS_DISABLED_ON_FAULT)) { |