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:32 +0000 |
| commit | b181366343168077c22c7365521624d2e7ba318b (patch) | |
| tree | ca76ed2789864257f1673d619d851222a8dc51f3 /mali_kbase/platform/pixel/pixel_gpu_slc.h | |
| parent | baa5e756f3010fa077030a9fe3a524733db85fa5 (diff) | |
| download | gpu-b181366343168077c22c7365521624d2e7ba318b.tar.gz | |
[DO NOT MERGE ANYWHERE] Revert "mali_kbase: Repurpose liveness ioctl as SLC 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: I687f950650aaf9a4c243e9474b53d47563e194a1
Diffstat (limited to 'mali_kbase/platform/pixel/pixel_gpu_slc.h')
| -rw-r--r-- | mali_kbase/platform/pixel/pixel_gpu_slc.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/mali_kbase/platform/pixel/pixel_gpu_slc.h b/mali_kbase/platform/pixel/pixel_gpu_slc.h index 8a59df0..cca2af9 100644 --- a/mali_kbase/platform/pixel/pixel_gpu_slc.h +++ b/mali_kbase/platform/pixel/pixel_gpu_slc.h @@ -8,6 +8,9 @@ #define _PIXEL_GPU_SLC_H_ #ifdef CONFIG_MALI_PIXEL_GPU_SLC +int gpu_pixel_handle_buffer_liveness_update_ioctl(struct kbase_context* kctx, + struct kbase_ioctl_buffer_liveness_update* update); + int gpu_slc_init(struct kbase_device *kbdev); void gpu_slc_term(struct kbase_device *kbdev); @@ -22,6 +25,12 @@ 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) +{ + return (void)kctx, (void)update, 0; +} + static int __maybe_unused gpu_slc_init(struct kbase_device *kbdev) { return (void)kbdev, 0; } static void __maybe_unused gpu_slc_term(struct kbase_device *kbdev) { (void)kbdev; } @@ -37,16 +46,4 @@ static void __maybe_unused gpu_slc_kctx_idle(struct kbase_context *kctx) { (void static void __maybe_unused gpu_slc_tick_tock(struct kbase_device *kbdev) { (void)kbdev; } #endif /* CONFIG_MALI_PIXEL_GPU_SLC */ -#if defined(CONFIG_MALI_PIXEL_GPU_SLC) && !defined(PIXEL_GPU_SLC_ACPM_SIGNAL) -int -gpu_pixel_handle_buffer_liveness_update_ioctl(struct kbase_context* kctx, - struct kbase_ioctl_buffer_liveness_update* update); -#else -static int __maybe_unused gpu_pixel_handle_buffer_liveness_update_ioctl(struct kbase_context* kctx, - struct kbase_ioctl_buffer_liveness_update* update) -{ - return (void)kctx, (void)update, 0; -} -#endif - #endif /* _PIXEL_GPU_SLC_H_ */ |