diff options
| author | Sidath Senanayake <sidaths@google.com> | 2018-03-19 13:26:23 +0100 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2018-03-19 13:26:23 +0100 |
| commit | 8946bcdee4c36dbc82b8c2a2abcf9c2f5eab5ae0 (patch) | |
| tree | adf890cf7a6af02a05c8eb94c177bd83ca21fd8b /mali_kbase/thirdparty | |
| parent | e42736e67f7d84d329d9595b7393e6784c5b887f (diff) | |
| download | gpu-8946bcdee4c36dbc82b8c2a2abcf9c2f5eab5ae0.tar.gz | |
Mali Bifrost DDK r11p0 KMD
Provenance:
b1581ebda (collaborate/EAC/b_r11p0)
BX304L01B-BU-00000-r11p0-01rel0
BX304L06A-BU-00000-r11p0-01rel0
BX304X07X-BU-00000-r11p0-01rel0
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ia590e1eb21778d33cacbefba83598ee56790ca85
Diffstat (limited to 'mali_kbase/thirdparty')
| -rw-r--r-- | mali_kbase/thirdparty/mali_kbase_mmap.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mali_kbase/thirdparty/mali_kbase_mmap.c b/mali_kbase/thirdparty/mali_kbase_mmap.c index 1690da4..6857eb7 100644 --- a/mali_kbase/thirdparty/mali_kbase_mmap.c +++ b/mali_kbase/thirdparty/mali_kbase_mmap.c @@ -245,12 +245,13 @@ unsigned long kbase_get_unmapped_area(struct file *filp, if (!kbase_ctx_flag(kctx, KCTX_COMPAT)) { - if (kbase_hw_has_feature(kctx->kbdev, - BASE_HW_FEATURE_33BIT_VA)) { - high_limit = kctx->same_va_end << PAGE_SHIFT; - } else { - high_limit = min_t(unsigned long, mm->mmap_base, - (kctx->same_va_end << PAGE_SHIFT)); + high_limit = min_t(unsigned long, mm->mmap_base, + (kctx->same_va_end << PAGE_SHIFT)); + + /* If there's enough (> 33 bits) of GPU VA space, align + * to 2MB boundaries. + */ + if (kctx->kbdev->gpu_props.mmu.va_bits > 33) { if (len >= SZ_2M) { align_offset = SZ_2M; align_mask = SZ_2M - 1; |