[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

7 files changed, 0 insertions, 49 deletions

diff --git a/mali_kbase/backend/gpu/mali_kbase_js_backend.c b/mali_kbase/backend/gpu/mali_kbase_js_backend.c
index 304737f..be72c4a 100644
--- a/mali_kbase/backend/gpu/mali_kbase_js_backend.c
+++ b/mali_kbase/backend/gpu/mali_kbase_js_backend.c
@@ -244,9 +244,6 @@ static enum hrtimer_restart timer_callback(struct hrtimer *timer)
 
 	spin_unlock_irqrestore(&kbdev->hwaccess_lock, flags);
 
-	/* Inform platform of scheduling event */
-	kbasep_platform_event_tick_tock(kbdev);
-
 	return HRTIMER_NORESTART;
 }
 
diff --git a/mali_kbase/csf/mali_kbase_csf_scheduler.c b/mali_kbase/csf/mali_kbase_csf_scheduler.c
index 22a08a6..f7f7ed0 100644
--- a/mali_kbase/csf/mali_kbase_csf_scheduler.c
+++ b/mali_kbase/csf/mali_kbase_csf_scheduler.c
@@ -43,7 +43,6 @@
 #include <mali_kbase_gpu_metrics.h>
 #include <csf/mali_kbase_csf_trace_buffer.h>
 #endif /* CONFIG_MALI_TRACE_POWER_GPU_WORK_PERIOD */
-#include <uapi/gpu/arm/midgard/platform/pixel/pixel_memory_group_manager.h>
 
 /* Value to indicate that a queue group is not groups_to_schedule list */
 #define KBASEP_GROUP_PREPARED_SEQ_NUM_INVALID (U32_MAX)
@@ -6686,9 +6685,6 @@ static int kbase_csf_scheduler_kthread(void *data)
 
 		dev_dbg(kbdev->dev, "Waking up for event after a scheduling iteration.");
 		wake_up_all(&kbdev->csf.event_wait);
-
-		/* Inform platform of scheduling event */
-		kbasep_platform_event_tick_tock(kbdev);
 	}
 
 	/* Wait for the other thread, that signaled the exit, to call kthread_stop() */
diff --git a/mali_kbase/mali_kbase_config.c b/mali_kbase/mali_kbase_config.c
index 669e1c3..72080a7 100644
--- a/mali_kbase/mali_kbase_config.c
+++ b/mali_kbase/mali_kbase_config.c
@@ -119,15 +119,6 @@ void kbasep_platform_event_work_end(void *param)
 		platform_funcs_p->platform_handler_work_end_func(param);
 }
 
-void kbasep_platform_event_tick_tock(struct kbase_device *kbdev)
-{
-	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_tick_tock)
-		platform_funcs_p->platform_handler_tick_tock(kbdev);
-}
-
 int kbasep_platform_fw_config_init(struct kbase_device *kbdev)
 {
 	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 549c170..7f6d3ed 100644
--- a/mali_kbase/mali_kbase_config.h
+++ b/mali_kbase/mali_kbase_config.h
@@ -138,14 +138,6 @@ struct kbase_platform_funcs_conf {
 	 */
 	void (*platform_handler_context_idle)(struct kbase_context *kctx);
 	/**
-	 * platform_handler_tick_tock - Platform specific callback when a scheduler tick/tock occurs.
-	 *
-	 * @kbdev: kbase_device pointer
-	 *
-	 * Context: Process context
-	 */
-	void (*platform_handler_tick_tock)(struct kbase_device *kbdev);
-	/**
 	 * platform_handler_work_begin_func - Platform specific handler whose
 	 *                                    function changes depending on the
 	 *                                    backend used.
@@ -642,16 +634,6 @@ void kbasep_platform_event_work_begin(void *param);
 void kbasep_platform_event_work_end(void *param);
 
 /**
- * kbasep_platform_tick_tock - Platform specific callback when a scheduler tick/tock occurs.
- *
- * @kbdev: kbase_device pointer
- *
- * Function calls a platform defined routine if specified in the configuration attributes.
- *
- */
-void kbasep_platform_event_tick_tock(struct kbase_device *kbdev);
-
-/**
  * kbasep_platform_fw_config_init - Platform specific callback to configure FW
  *
  * @kbdev - kbase_device pointer
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
@@ -126,16 +126,6 @@ void gpu_slc_kctx_idle(struct kbase_context *kctx)
 }
 
 /**
- * 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
  *
  * @kbdev: The &struct kbase_device 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_ */