diff options
| author | Jack Diver <diverj@google.com> | 2022-11-07 12:13:47 +0000 |
|---|---|---|
| committer | Jack Diver <diverj@google.com> | 2022-11-07 12:14:25 +0000 |
| commit | 1c916e3f7c4d999f68e40c60fee6fe39418fcecd (patch) | |
| tree | 0bdfdcc3c70a6378c8265b03e3fba6b8120ffa21 /mali_pixel/memory_group_manager.c | |
| parent | d0916fc72f400db8c6a80bbd010b935819a424e8 (diff) | |
| download | gpu-1c916e3f7c4d999f68e40c60fee6fe39418fcecd.tar.gz | |
Revert "Revert "Merge r38p1 from upstream into partner/android13-gs-pixel-5.10-tm-qpr2""
This reverts commit 34e635317dc2a91076ac341df3867ac3bdb31ef1.
Bug: 228779790
Change-Id: Ica7fbc34d4c725f36a302ae9723606dcf828c452
Diffstat (limited to 'mali_pixel/memory_group_manager.c')
| -rw-r--r-- | mali_pixel/memory_group_manager.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mali_pixel/memory_group_manager.c b/mali_pixel/memory_group_manager.c index faa414e..436404e 100644 --- a/mali_pixel/memory_group_manager.c +++ b/mali_pixel/memory_group_manager.c @@ -549,7 +549,7 @@ static u64 mgm_update_gpu_pte( switch (group_id) { case MGM_RESERVED_GROUP_ID: - case MGM_IMPORTED_MEMORY_GROUP_ID: + case MGM_IMPORTED_MEMORY_GROUP_ID: /* The reserved group doesn't set PBHA bits */ /* TODO: Determine what to do with imported memory */ break; @@ -745,13 +745,14 @@ static int memory_group_manager_probe(struct platform_device *pdev) return -ENOMEM; mgm_dev->owner = THIS_MODULE; - mgm_dev->ops.mgm_alloc_page = mgm_alloc_page; - mgm_dev->ops.mgm_free_page = mgm_free_page; - mgm_dev->ops.mgm_get_import_memory_id = - mgm_get_import_memory_id; - mgm_dev->ops.mgm_vmf_insert_pfn_prot = mgm_vmf_insert_pfn_prot; - mgm_dev->ops.mgm_update_gpu_pte = mgm_update_gpu_pte; - mgm_dev->ops.mgm_pte_to_original_pte = mgm_pte_to_original_pte; + mgm_dev->ops = (struct memory_group_manager_ops){ + .mgm_alloc_page = mgm_alloc_page, + .mgm_free_page = mgm_free_page, + .mgm_get_import_memory_id = mgm_get_import_memory_id, + .mgm_update_gpu_pte = mgm_update_gpu_pte, + .mgm_pte_to_original_pte = mgm_pte_to_original_pte, + .mgm_vmf_insert_pfn_prot = mgm_vmf_insert_pfn_prot, + }; mgm_data = kzalloc(sizeof(*mgm_data), GFP_KERNEL); if (!mgm_data) { |