diff options
| author | Jack Diver <diverj@google.com> | 2023-08-21 13:58:27 +0000 |
|---|---|---|
| committer | Jack Diver <diverj@google.com> | 2024-02-28 18:23:43 +0000 |
| commit | 2dd21a70c75d09b6e73838f8882e19dd734a66f0 (patch) | |
| tree | 0b15dc3751ac9f8f90c9beb03789c1fe8f3f8ffd | |
| parent | 1315948510c02a20fe94f27634c58f97803c1d29 (diff) | |
| download | gpu-2dd21a70c75d09b6e73838f8882e19dd734a66f0.tar.gz | |
Revert "mali_pixel: mgm: Compensate for group migration"
This reverts commit 7bb27d3d29f850315d0b7ee103fbdfe75e9403da.
reason: We don't perform group migration any more, so there is no need
to compensate for it.
Bug: 313458962
Test: gfxbench
Signed-off-by: Jack Diver <diverj@google.com>
(cherry picked from https://partner-android-review.googlesource.com/q/commit:f43b42cacab9027492afaf90d534f6b2955a176d)
Merged-In: Ifbbc26e45c68337de901ab26e502a0644e8433ff
Change-Id: Ifbbc26e45c68337de901ab26e502a0644e8433ff
| -rw-r--r-- | mali_pixel/memory_group_manager.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/mali_pixel/memory_group_manager.c b/mali_pixel/memory_group_manager.c index 3015468..4d92ea7 100644 --- a/mali_pixel/memory_group_manager.c +++ b/mali_pixel/memory_group_manager.c @@ -376,26 +376,7 @@ static void update_size(struct memory_group_manager_device *mgm_dev, unsigned in atomic_inc(size); atomic64_add(1 << order, &total_gpu_pages); } else { - if (atomic_dec_return(size) < 0) { - /* b/289501175 - * Pages are often 'migrated' to the SLC group, which needs special - * accounting. - * - * TODO: Remove after SLC MGM decoupling b/290354607 - */ - if (!WARN_ON(group_id != MGM_SLC_GROUP_ID)) { - /* Undo the dec, and instead decrement the reserved group counter. - * This is still making the assumption that the migration came from - * the reserved group. Currently this is always true, however it - * might not be in future. It would be invasive and costly to track - * where every page came from, so instead this will be fixed as part - * of the b/290354607 effort. - */ - atomic_inc(size); - update_size(mgm_dev, MGM_RESERVED_GROUP_ID, order, alloc); - return; - } - } + WARN_ON(atomic_dec_return(size) < 0); atomic64_sub(1 << order, &total_gpu_pages); } |