diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-06-15 13:39:30 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-06-15 14:11:16 +0100 |
| commit | fca8613cfcf585bf9113dca96a05daea9fd89794 (patch) | |
| tree | f2baa14910f83edf00450bc30d3703eb255a0bba /mali_kbase/mali_kbase_mem.c | |
| parent | 8037b534570814775d79aeddd06b76e5ee941f59 (diff) | |
| download | gpu-fca8613cfcf585bf9113dca96a05daea9fd89794.tar.gz | |
Mali Valhall DDK r31p0 KMD
Provenance: 2ea0ef9bd (collaborate/EAC/v_r31p0)
VX504X08X-BU-00000-r31p0-01eac0 - Valhall Android DDK
VX504X08X-BU-60000-r31p0-01eac0 - Valhall Android Document Bundle
VX504X08X-DC-11001-r31p0-01eac0 - Valhall Android DDK Software Errata
VX504X08X-SW-99006-r31p0-01eac0 - Valhall Android Renderscript AOSP parts
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ide9d5fdc6d9c95fa66a3546b01f619b43c09496d
Diffstat (limited to 'mali_kbase/mali_kbase_mem.c')
| -rw-r--r-- | mali_kbase/mali_kbase_mem.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mali_kbase/mali_kbase_mem.c b/mali_kbase/mali_kbase_mem.c index fd992e2..326917c 100644 --- a/mali_kbase/mali_kbase_mem.c +++ b/mali_kbase/mali_kbase_mem.c @@ -849,7 +849,7 @@ bool kbase_has_exec_va_zone(struct kbase_context *kctx) * * Return: true if any allocs exist on any zone, false otherwise */ -bool kbase_region_tracker_has_allocs(struct kbase_context *kctx) +static bool kbase_region_tracker_has_allocs(struct kbase_context *kctx) { unsigned int zone_idx; @@ -1393,7 +1393,7 @@ void kbase_free_alloced_region(struct kbase_va_region *reg) if (WARN_ON(kbase_is_region_invalid(reg))) return; - dev_dbg(kctx->kbdev->dev, "Freeing memory region %p\n", + dev_dbg(kctx->kbdev->dev, "Freeing memory region %pK\n", (void *)reg); #if MALI_USE_CSF if (reg->flags & KBASE_REG_CSF_EVENT) @@ -1916,7 +1916,7 @@ int kbase_mem_free_region(struct kbase_context *kctx, struct kbase_va_region *re KBASE_DEBUG_ASSERT(kctx != NULL); KBASE_DEBUG_ASSERT(reg != NULL); - dev_dbg(kctx->kbdev->dev, "%s %p in kctx %p\n", + dev_dbg(kctx->kbdev->dev, "%s %pK in kctx %pK\n", __func__, (void *)reg, (void *)kctx); lockdep_assert_held(&kctx->reg_lock); @@ -1975,7 +1975,7 @@ int kbase_mem_free(struct kbase_context *kctx, u64 gpu_addr) struct kbase_va_region *reg; KBASE_DEBUG_ASSERT(kctx != NULL); - dev_dbg(kctx->kbdev->dev, "%s 0x%llx in kctx %p\n", + dev_dbg(kctx->kbdev->dev, "%s 0x%llx in kctx %pK\n", __func__, gpu_addr, (void *)kctx); if ((gpu_addr & ~PAGE_MASK) && (gpu_addr >= PAGE_SIZE)) { @@ -2772,6 +2772,7 @@ void kbase_free_phy_pages_helper_locked(struct kbase_mem_phy_alloc *alloc, kbase_trace_gpu_mem_usage_dec(kctx->kbdev, kctx, freed); } } +KBASE_EXPORT_TEST_API(kbase_free_phy_pages_helper_locked); #if MALI_USE_CSF /** @@ -4233,8 +4234,11 @@ void kbase_jit_free(struct kbase_context *kctx, struct kbase_va_region *reg) div_u64(old_pages * (100 - kctx->trim_level), 100)); u64 delta = old_pages - new_size; - if (delta) + if (delta) { + mutex_lock(&kctx->reg_lock); kbase_mem_shrink(kctx, reg, old_pages - delta); + mutex_unlock(&kctx->reg_lock); + } } #if MALI_JIT_PRESSURE_LIMIT_BASE |