diff options
| author | Alex Hong <rurumihong@google.com> | 2021-11-25 19:49:27 +0800 |
|---|---|---|
| committer | Alex Hong <rurumihong@google.com> | 2021-11-25 19:49:51 +0800 |
| commit | e9ea9c8d4c8cffa826c55f283742e59fe3d81449 (patch) | |
| tree | 340828e806c593ebaf382c5a5845559e7b41e018 /mali_pixel/memory_group_manager.c | |
| parent | 8b5b457204a2d553b09140e45f326d6639b1a19b (diff) | |
| parent | b186ca7c5f88dd3bbcc03bfbe7747191f72f23d5 (diff) | |
| download | gpu-e9ea9c8d4c8cffa826c55f283742e59fe3d81449.tar.gz | |
Merge android13-gs-pixel-5.10-gs101 into android13-gs-pixel-5.10
Bug: 199698959
Change-Id: I3ca3b85eb2145b11b9f0384995753daf76030568
Signed-off-by: Alex Hong <rurumihong@google.com>
Diffstat (limited to 'mali_pixel/memory_group_manager.c')
| -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 bd5e4a7..d702b3e 100644 --- a/mali_pixel/memory_group_manager.c +++ b/mali_pixel/memory_group_manager.c @@ -97,6 +97,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 @@ -107,6 +108,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; @@ -412,6 +414,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 */ @@ -611,6 +617,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); |