diff options
| author | Siddharth Kapoor <ksiddharth@google.com> | 2021-11-26 19:02:16 +0800 |
|---|---|---|
| committer | Siddharth Kapoor <ksiddharth@google.com> | 2021-12-06 11:32:22 +0800 |
| commit | 93dab6a30cedaf7e6307492cbaa5f651514a7764 (patch) | |
| tree | 8290861c9f9c7144bc8ee907089a063f6a6041d0 /mali_kbase/mali_kbase_dummy_job_wa.c | |
| parent | e2249eb4503b74f19f9081b3e68fcbc824afdc10 (diff) | |
| parent | 0c596dc70431fa2c70021fa1685e3efc969a852d (diff) | |
| download | gpu-93dab6a30cedaf7e6307492cbaa5f651514a7764.tar.gz | |
Merge r34p0-00dev1 from upstream into android-gs-pixel-5.10-gs101
Change-Id: I051ad3af9ac645fb8585219c48210df424a27807
Signed-off-by: Siddharth Kapoor <ksiddharth@google.com>
Diffstat (limited to 'mali_kbase/mali_kbase_dummy_job_wa.c')
| -rw-r--r-- | mali_kbase/mali_kbase_dummy_job_wa.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mali_kbase/mali_kbase_dummy_job_wa.c b/mali_kbase/mali_kbase_dummy_job_wa.c index 4d6bb5c..04bbd78 100644 --- a/mali_kbase/mali_kbase_dummy_job_wa.c +++ b/mali_kbase/mali_kbase_dummy_job_wa.c @@ -278,6 +278,11 @@ int kbase_dummy_job_wa_load(struct kbase_device *kbdev) int err; struct kbase_context *kctx; + /* Calls to this function are inherently asynchronous, with respect to + * MMU operations. + */ + const enum kbase_caller_mmu_sync_info mmu_sync_info = CALLER_MMU_ASYNC; + lockdep_assert_held(&kbdev->fw_load_lock); if (!wa_blob_load_needed(kbdev)) @@ -372,8 +377,8 @@ int kbase_dummy_job_wa_load(struct kbase_device *kbdev) nr_pages = PFN_UP(blob->size); flags = blob->map_flags | BASE_MEM_FLAG_MAP_FIXED; - va_region = kbase_mem_alloc(kctx, nr_pages, nr_pages, - 0, &flags, &gpu_va); + va_region = kbase_mem_alloc(kctx, nr_pages, nr_pages, 0, &flags, + &gpu_va, mmu_sync_info); if (!va_region) { dev_err(kbdev->dev, "Failed to allocate for blob\n"); |