summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-08-02 17:47:59 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-08-10 21:23:53 -0400
commit6effe31755c3fc7578b10f39012983e33d80a9bf (patch)
treeffa33fb0bc22adcca53e1322e71e6a166eeae3d6 /drivers
parent4a979fd7bc7bc3799e51bc9589c60407fe6bf444 (diff)
gpu: nvgpu: Exclude first page from vidmem size
We initialized vidmem allocator with base=4K, and size of 4GB. This caused allocator to allocate addresses between 4K and 4GB+4K, causing a physical MMU fault. Bug 1793810 Change-Id: I554f62aeee4080acd86ef2c8011089ec9b8120df Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1196300 (cherry picked from commit 41a860e21c6da3f8fda58ceb56e78316f6987f53) Reviewed-on: http://git-master/r/1200712 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 16ff8ee8..b63444d0 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -765,7 +765,7 @@ static int gk20a_init_vidmem(struct mm_gk20a *mm)
765 return 0; 765 return 0;
766 766
767 err = gk20a_buddy_allocator_init(&g->mm.vidmem.allocator, "vidmem", 767 err = gk20a_buddy_allocator_init(&g->mm.vidmem.allocator, "vidmem",
768 SZ_4K, size, SZ_4K, 0); 768 SZ_4K, size - SZ_4K, SZ_4K, 0);
769 if (err) { 769 if (err) {
770 gk20a_err(d, "Failed to register vidmem for size %zu: %d", 770 gk20a_err(d, "Failed to register vidmem for size %zu: %d",
771 size, err); 771 size, err);