diff options
| author | Alex Hong <rurumihong@google.com> | 2021-11-25 19:01:43 +0800 |
|---|---|---|
| committer | Alex Hong <rurumihong@google.com> | 2021-11-25 19:02:26 +0800 |
| commit | b186ca7c5f88dd3bbcc03bfbe7747191f72f23d5 (patch) | |
| tree | ec973cb287305c8fcfcba2daf9f62e12ff5fd056 | |
| parent | e2249eb4503b74f19f9081b3e68fcbc824afdc10 (diff) | |
| parent | 99ca7746265db8d38cc2722cb61b09dea6fe543c (diff) | |
| download | gpu-b186ca7c5f88dd3bbcc03bfbe7747191f72f23d5.tar.gz | |
Merge android12-gs-pixel-5.10-sc-v2 into android13-gs-pixel-5.10-gs101
Bug: 199698959
Change-Id: Iede25588af698e04c77d8bee5a5625c3848c246d
Signed-off-by: Alex Hong <rurumihong@google.com>
| -rw-r--r-- | mali_pixel/memory_group_manager.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mali_pixel/memory_group_manager.c b/mali_pixel/memory_group_manager.c index d057148..5c98a5d 100644 --- a/mali_pixel/memory_group_manager.c +++ b/mali_pixel/memory_group_manager.c @@ -94,6 +94,7 @@ struct mgm_group { * struct mgm_groups - Structure for groups of memory group manager * * @groups: To keep track of the number of allocated pages of all groups + * @ngroups: Number of groups actually used * @dev: device attached * @pt_handle: Link to SLC partition data * @kobj: &sruct kobject used for linking to pixel_stats_sysfs node @@ -104,6 +105,7 @@ struct mgm_group { */ struct mgm_groups { struct mgm_group groups[MEMORY_GROUP_MANAGER_NR_GROUPS]; + size_t ngroups; struct device *dev; struct pt_handle *pt_handle; struct kobject kobj; @@ -397,6 +399,10 @@ static struct page *mgm_alloc_page( if (INVALID_GROUP_ID(group_id)) return NULL; + if (WARN_ON_ONCE((group_id != MGM_RESERVED_GROUP_ID) && + (GROUP_ID_TO_PT_IDX(group_id) >= data->ngroups))) + return NULL; + /* We don't expect to be allocting pages into the group used for * external or imported memory */ @@ -596,6 +602,14 @@ static int mgm_initialize_data(struct mgm_groups *mgm_data) { int i, ret; + const int ngroups = of_property_count_strings(mgm_data->dev->of_node, "pt_id"); + if (WARN_ON(ngroups < 0) || + WARN_ON(ngroups > MEMORY_GROUP_MANAGER_NR_GROUPS)) { + mgm_data->ngroups = 0; + } else { + mgm_data->ngroups = ngroups; + } + for (i = 0; i < MEMORY_GROUP_MANAGER_NR_GROUPS; i++) { atomic_set(&mgm_data->groups[i].size, 0); atomic_set(&mgm_data->groups[i].lp_size, 0); |