diff options
author | Bharat Nihalani <bnihalani@nvidia.com> | 2015-06-04 08:08:59 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-06-04 13:41:00 -0400 |
commit | b8aa486109a43a8c92159b0845a4adc9f6a84654 (patch) | |
tree | 9086e63713df6a63d4ad152503c49e238d23c7d3 /drivers/gpu/nvgpu/gk20a/gk20a.c | |
parent | 56d7896731c91595db3205777f308fbcaeac7340 (diff) |
Revert "Revert "Revert "Revert "gpu: nvgpu: New allocator for VA space""""
This reverts commit 2e5803d0f2b7d7a1577a40f45ab9f3b22ef2df80 since
the issue seen with bug 200106514 is fixed with change
http://git-master/r/#/c/752080/.
Bug 200112195
Change-Id: I588151c2a7ea74bd89dc3fd48bb81ff2c49f5a0a
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/752503
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 697670c3..cc1b221d 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -59,6 +59,7 @@ | |||
59 | #include "hw_fb_gk20a.h" | 59 | #include "hw_fb_gk20a.h" |
60 | #include "gk20a_scale.h" | 60 | #include "gk20a_scale.h" |
61 | #include "dbg_gpu_gk20a.h" | 61 | #include "dbg_gpu_gk20a.h" |
62 | #include "gk20a_allocator.h" | ||
62 | #include "hal.h" | 63 | #include "hal.h" |
63 | #include "vgpu/vgpu.h" | 64 | #include "vgpu/vgpu.h" |
64 | 65 | ||
@@ -1533,6 +1534,7 @@ static int gk20a_probe(struct platform_device *dev) | |||
1533 | gr_gk20a_debugfs_init(gk20a); | 1534 | gr_gk20a_debugfs_init(gk20a); |
1534 | gk20a_pmu_debugfs_init(dev); | 1535 | gk20a_pmu_debugfs_init(dev); |
1535 | gk20a_cde_debugfs_init(dev); | 1536 | gk20a_cde_debugfs_init(dev); |
1537 | gk20a_alloc_debugfs_init(dev); | ||
1536 | #endif | 1538 | #endif |
1537 | 1539 | ||
1538 | gk20a_init_gr(gk20a); | 1540 | gk20a_init_gr(gk20a); |