diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-01-29 14:51:21 +0000 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-01-29 14:51:21 +0000 |
| commit | 201c8bfb4637601363b6e9283f3bdc510711a226 (patch) | |
| tree | afa8b543c81e78e5b82156be5d5266060c71e069 /mali_kbase/thirdparty | |
| parent | 72f2457ff7355ff0389efe5bc9cec3365362d8c4 (diff) | |
| download | gpu-201c8bfb4637601363b6e9283f3bdc510711a226.tar.gz | |
Mali Valhall DDK r28p0 KMD
Provenance:
f61f43e2c (collaborate/EAC/v_r28p0)
VX504X08X-BU-00000-r28p0-01eac0 - Android DDK
VX504X08X-SW-99006-r28p0-01eac0 - Android Renderscript AOSP parts
VX504X08X-BU-60000-r28p0-01eac0 - Android Document Bundle
VX504X08X-DC-11001-r28p0-01eac0 - Valhall Android DDK Software Errata
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Iafabf59869cc06a23d69668f6ae1a152cb86b7f3
Diffstat (limited to 'mali_kbase/thirdparty')
| -rw-r--r-- | mali_kbase/thirdparty/mali_kbase_mmap.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mali_kbase/thirdparty/mali_kbase_mmap.c b/mali_kbase/thirdparty/mali_kbase_mmap.c index cd90ea0..83a293d 100644 --- a/mali_kbase/thirdparty/mali_kbase_mmap.c +++ b/mali_kbase/thirdparty/mali_kbase_mmap.c @@ -319,18 +319,21 @@ unsigned long kbase_context_get_unmapped_area(struct kbase_context *const kctx, } #if !MALI_USE_CSF } else if (reg->flags & KBASE_REG_TILER_ALIGN_TOP) { - unsigned long extent_bytes = - (unsigned long)(reg->extent << PAGE_SHIFT); + unsigned long extension_bytes = + (unsigned long)(reg->extension + << PAGE_SHIFT); /* kbase_check_alloc_sizes() already satisfies * these checks, but they're here to avoid * maintenance hazards due to the assumptions * involved */ - WARN_ON(reg->extent > (ULONG_MAX >> PAGE_SHIFT)); + WARN_ON(reg->extension > + (ULONG_MAX >> PAGE_SHIFT)); WARN_ON(reg->initial_commit > (ULONG_MAX >> PAGE_SHIFT)); - WARN_ON(!is_power_of_2(extent_bytes)); - align_mask = extent_bytes - 1; + WARN_ON(!is_power_of_2(extension_bytes)); + align_mask = extension_bytes - 1; align_offset = - extent_bytes - (reg->initial_commit << PAGE_SHIFT); + extension_bytes - + (reg->initial_commit << PAGE_SHIFT); #endif /* !MALI_USE_CSF */ } else if (reg->flags & KBASE_REG_GPU_VA_SAME_4GB_PAGE) { is_same_4gb_page = true; |