diff options
author | Aparna Das <aparnad@nvidia.com> | 2018-07-25 20:43:32 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-09 21:45:42 -0400 |
commit | 9c13b30a465ed94f1e3547dc439462c3ea496eb8 (patch) | |
tree | bcb6b30d3bbee222b1824c4b91bf233391e908fe /drivers/gpu/nvgpu/common/fb | |
parent | 0a0ad7e67560cfc18874795532ee1eba3b865e59 (diff) |
gpu: nvgpu: make cbc alloc os specific
CBC base needs to be aligned to 64KB. On Linux this is
achieved making compbit backing size multiple of 64KB.
However QNX nvmap alloc function does not allocate
memory aligned to requested size and needs to overallocate
to satisfy alignment requirement. Make cbc alloc function OS
specific to be able to modify QNX code.
Also align cbc base address to 64KB before writing to CBC BASE
register.
Bug 200426427
Change-Id: Ic867501403f2e2a4ba41ad5a8ed6f9c5c8ffa3f4
Signed-off-by: Aparna Das <aparnad@nvidia.com>
(cherry picked from commit 3f1e1133a46ebfc9763c649d7b839d069cae5a36)
Reviewed-on: https://git-master.nvidia.com/r/1786046
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/fb')
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv11b.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c index 664b2dd1..6973e04d 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c | |||
@@ -102,6 +102,8 @@ void gv11b_fb_init_cbc(struct gk20a *g, struct gr_gk20a *gr) | |||
102 | else | 102 | else |
103 | compbit_store_iova = nvgpu_mem_get_addr(g, | 103 | compbit_store_iova = nvgpu_mem_get_addr(g, |
104 | &gr->compbit_store.mem); | 104 | &gr->compbit_store.mem); |
105 | /* must be aligned to 64 KB */ | ||
106 | compbit_store_iova = roundup(compbit_store_iova, (u64)SZ_64K); | ||
105 | 107 | ||
106 | compbit_base_post_divide64 = compbit_store_iova >> | 108 | compbit_base_post_divide64 = compbit_store_iova >> |
107 | fb_mmu_cbc_base_address_alignment_shift_v(); | 109 | fb_mmu_cbc_base_address_alignment_shift_v(); |