From 1dd0e69d4683cade5e1d53356d4663a3657a7a6c Mon Sep 17 00:00:00 2001 From: Jack Diver Date: Wed, 13 Mar 2024 16:33:34 +0000 Subject: [DO NOT MERGE ANYWHERE] Revert "mali_pixel: Periodically read ACPM GPU signal" 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: I61f877019194c4c86cc0df79ea466adecceaef19 --- mali_kbase/platform/pixel/pixel_gpu.c | 1 - mali_kbase/platform/pixel/pixel_gpu_slc.c | 10 ---------- mali_kbase/platform/pixel/pixel_gpu_slc.h | 4 ---- 3 files changed, 15 deletions(-) (limited to 'mali_kbase/platform') diff --git a/mali_kbase/platform/pixel/pixel_gpu.c b/mali_kbase/platform/pixel/pixel_gpu.c index 6e30053..ba0ceb8 100644 --- a/mali_kbase/platform/pixel/pixel_gpu.c +++ b/mali_kbase/platform/pixel/pixel_gpu.c @@ -282,7 +282,6 @@ struct kbase_platform_funcs_conf platform_funcs = { .platform_handler_work_end_func = &gpu_dvfs_metrics_work_end, .platform_handler_context_active = &gpu_slc_kctx_active, .platform_handler_context_idle = &gpu_slc_kctx_idle, - .platform_handler_tick_tock = &gpu_slc_tick_tock, .platform_fw_cfg_init_func = &gpu_fw_cfg_init, .platform_handler_core_dump_func = &gpu_sscd_dump, }; diff --git a/mali_kbase/platform/pixel/pixel_gpu_slc.c b/mali_kbase/platform/pixel/pixel_gpu_slc.c index cf330af..e8aae75 100644 --- a/mali_kbase/platform/pixel/pixel_gpu_slc.c +++ b/mali_kbase/platform/pixel/pixel_gpu_slc.c @@ -125,16 +125,6 @@ void gpu_slc_kctx_idle(struct kbase_context *kctx) pixel_mgm_slc_dec_refcount(kctx->kbdev->mgm_dev); } -/** - * gpu_slc_tick_tock() - Called when a GPU scheduling kick occurs - * - * @kbdev: The &struct kbase_device for the GPU. - */ -void gpu_slc_tick_tock(struct kbase_device *kbdev) -{ - pixel_mgm_slc_update_signal(kbdev->mgm_dev, 0); -} - /** * gpu_slc_init - Initialize the SLC context for the GPU * diff --git a/mali_kbase/platform/pixel/pixel_gpu_slc.h b/mali_kbase/platform/pixel/pixel_gpu_slc.h index cca2af9..82d0779 100644 --- a/mali_kbase/platform/pixel/pixel_gpu_slc.h +++ b/mali_kbase/platform/pixel/pixel_gpu_slc.h @@ -22,8 +22,6 @@ void gpu_slc_kctx_term(struct kbase_context *kctx); void gpu_slc_kctx_active(struct kbase_context *kctx); void gpu_slc_kctx_idle(struct kbase_context *kctx); - -void gpu_slc_tick_tock(struct kbase_device *kbdev); #else static int __maybe_unused gpu_pixel_handle_buffer_liveness_update_ioctl(struct kbase_context* kctx, struct kbase_ioctl_buffer_liveness_update* update) @@ -42,8 +40,6 @@ static void __maybe_unused gpu_slc_kctx_term(struct kbase_context* kctx) { (void static void __maybe_unused gpu_slc_kctx_active(struct kbase_context *kctx) { (void)kctx; } static void __maybe_unused gpu_slc_kctx_idle(struct kbase_context *kctx) { (void)kctx; } - -static void __maybe_unused gpu_slc_tick_tock(struct kbase_device *kbdev) { (void)kbdev; } #endif /* CONFIG_MALI_PIXEL_GPU_SLC */ #endif /* _PIXEL_GPU_SLC_H_ */ -- cgit v1.2.3