diff options
| author | Jack Diver <diverj@google.com> | 2024-03-05 04:30:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-05 04:30:16 +0000 |
| commit | 685ad49aa8c337de97226a76c8c9dc5dfc5d08b9 (patch) | |
| tree | 0b15dc3751ac9f8f90c9beb03789c1fe8f3f8ffd | |
| parent | 4289c25b5746a0922c0ca1d18a881a244d81d788 (diff) | |
| parent | 2dd21a70c75d09b6e73838f8882e19dd734a66f0 (diff) | |
| download | gpu-685ad49aa8c337de97226a76c8c9dc5dfc5d08b9.tar.gz | |
Revert "mali_pixel: mgm: Compensate for group migration" am: 2dd21a70c7
Original change: https://partner-android-review.googlesource.com/c/kernel/private/google-modules/gpu/+/2753874
Change-Id: I3cf6b99850f4a71e13aa513f5b43dbc85f42fa82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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); } |