diff options
| author | Vamsidhar reddy Gaddam <gvamsi@google.com> | 2023-12-20 12:42:26 +0000 |
|---|---|---|
| committer | Vamsidhar reddy Gaddam <gvamsi@google.com> | 2024-01-05 09:19:17 +0000 |
| commit | 11473542814286e59a89a70c969fb50a25ba921f (patch) | |
| tree | bd4aa60e7d3dc895d82a36fcea0026569e3a04aa /mali_kbase/mali_kbase_mem_migrate.c | |
| parent | 8768eedce66a4373c96f35c8dfb73d4668703180 (diff) | |
| parent | 049a542207ed694271316782397b78b2e202086a (diff) | |
| download | gpu-11473542814286e59a89a70c969fb50a25ba921f.tar.gz | |
Merge branch 'upstream' into HEAD
Update KMD to R47P0
Bug: 315267052
Test: Outlined in go/pixel-gpu-kmd-r47p0
Change-Id: I89454c4c862033fe330b260a9bc6cc777a3ca231
Signed-off-by: Vamsidhar reddy Gaddam <gvamsi@google.com>
Diffstat (limited to 'mali_kbase/mali_kbase_mem_migrate.c')
| -rw-r--r-- | mali_kbase/mali_kbase_mem_migrate.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mali_kbase/mali_kbase_mem_migrate.c b/mali_kbase/mali_kbase_mem_migrate.c index 4c2cc0f..6638b76 100644 --- a/mali_kbase/mali_kbase_mem_migrate.c +++ b/mali_kbase/mali_kbase_mem_migrate.c @@ -295,7 +295,8 @@ static int kbasep_migrate_page_allocated_mapped(struct page *old_page, struct pa /* Unmap the old physical range. */ unmap_mapping_range(kctx->kfile->filp->f_inode->i_mapping, - page_md->data.mapped.vpfn << PAGE_SHIFT, + (loff_t)(page_md->data.mapped.vpfn / GPU_PAGES_PER_CPU_PAGE) + << PAGE_SHIFT, PAGE_SIZE, 1); ret = kbase_mmu_migrate_page(as_tagged(page_to_phys(old_page)), @@ -687,9 +688,6 @@ void kbase_mem_migrate_init(struct kbase_device *kbdev) spin_lock_init(&mem_migrate->free_pages_lock); INIT_LIST_HEAD(&mem_migrate->free_pages_list); -#if (KERNEL_VERSION(6, 0, 0) > LINUX_VERSION_CODE) - mem_migrate->inode = NULL; -#endif mem_migrate->free_pages_workq = alloc_workqueue("free_pages_workq", WQ_UNBOUND | WQ_MEM_RECLAIM, 1); INIT_WORK(&mem_migrate->free_pages_work, kbase_free_pages_worker); |