diff options
| author | Vamsidhar reddy Gaddam <gvamsi@google.com> | 2024-02-14 10:31:54 +0000 |
|---|---|---|
| committer | Vamsidhar reddy Gaddam <gvamsi@google.com> | 2024-02-14 10:31:54 +0000 |
| commit | 3652f0a0fb206a8d59571fb5b93bed3a1dd8a894 (patch) | |
| tree | b5fb1fb91d411c72c89213248c713fb9ef88b7e7 | |
| parent | a11b3dd9a017e3e0ec7c3bc5cadc5e6eaca273ce (diff) | |
| download | gpu-3652f0a0fb206a8d59571fb5b93bed3a1dd8a894.tar.gz | |
Clean IFPO left-overs in 5.15 branch
Stale IFPO code that did not get removed by up-merge from 5.10 is now
removed.
Bug: 324019470
Test: Local build
Change-Id: I8e82bf7e50573d866bcc60edf6776ebf993472fb
Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
| -rw-r--r-- | mali_kbase/csf/mali_kbase_csf_firmware.c | 2 | ||||
| -rw-r--r-- | mali_kbase/csf/mali_kbase_csf_scheduler.c | 7 | ||||
| -rw-r--r-- | mali_kbase/platform/pixel/pixel_gpu_power.c | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/mali_kbase/csf/mali_kbase_csf_firmware.c b/mali_kbase/csf/mali_kbase_csf_firmware.c index bc3230b..2599c12 100644 --- a/mali_kbase/csf/mali_kbase_csf_firmware.c +++ b/mali_kbase/csf/mali_kbase_csf_firmware.c @@ -1792,13 +1792,11 @@ static void global_init(struct kbase_device *const kbdev, u64 core_mask) set_timeout_global(global_iface, kbase_csf_timeout_get(kbdev)); -#ifndef CONFIG_MALI_HOST_CONTROLS_SC_RAILS /* The GPU idle timer is always enabled for simplicity. Checks will be * done before scheduling the GPU idle worker to see if it is * appropriate for the current power policy. */ enable_gpu_idle_timer(kbdev); -#endif /* Unmask the interrupts */ kbase_csf_firmware_global_input(global_iface, GLB_ACK_IRQ_MASK, ack_irq_mask); diff --git a/mali_kbase/csf/mali_kbase_csf_scheduler.c b/mali_kbase/csf/mali_kbase_csf_scheduler.c index af08b98..8ead416 100644 --- a/mali_kbase/csf/mali_kbase_csf_scheduler.c +++ b/mali_kbase/csf/mali_kbase_csf_scheduler.c @@ -1892,9 +1892,6 @@ int kbase_csf_scheduler_queue_start(struct kbase_queue *queue) bool const cs_enabled = queue->enabled; int err = 0; bool evicted = false; -#ifdef CONFIG_MALI_HOST_CONTROLS_SC_RAILS - unsigned long flags; -#endif kbase_reset_gpu_assert_prevented(kbdev); lockdep_assert_held(&queue->kctx->csf.lock); @@ -6952,10 +6949,6 @@ int kbase_csf_scheduler_pm_suspend_no_lock(struct kbase_device *kbdev) goto exit; } else { dev_info(kbdev->dev, "Scheduler PM suspend"); -#ifdef CONFIG_MALI_HOST_CONTROLS_SC_RAILS - turn_off_sc_power_rails(kbdev); - ack_gpu_idle_event(kbdev); -#endif scheduler_suspend(kbdev); cancel_tick_work(scheduler); } diff --git a/mali_kbase/platform/pixel/pixel_gpu_power.c b/mali_kbase/platform/pixel/pixel_gpu_power.c index a6139f2..1cd0673 100644 --- a/mali_kbase/platform/pixel/pixel_gpu_power.c +++ b/mali_kbase/platform/pixel/pixel_gpu_power.c @@ -33,10 +33,6 @@ #include <trace/events/power.h> #include <trace/hooks/systrace.h> -#if IS_ENABLED(CONFIG_MALI_PM_RUNTIME_S2MPU_CONTROL) && IS_ENABLED(CONFIG_MALI_HOST_CONTROLS_SC_RAILS) -#error "s2mpu device runtime PM control is not expected to be enabled with host-side shader rail control" -#endif - /* * GPU_PM_DOMAIN_NAMES - names for GPU power domains. * |