diff options
author | Alex Waterman <alexw@nvidia.com> | 2015-05-15 12:13:28 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-05-19 16:09:00 -0400 |
commit | 01f359f3f1bbf95d7ac4453a6c1de811bf0aee11 (patch) | |
tree | c35c928fcacaae7be13b4601538032dae9f672c6 /drivers/gpu/nvgpu/gk20a/gk20a.c | |
parent | 7ddd6e261ed620dbb388202be89ca4e6843e3947 (diff) |
Revert "Revert "gpu: nvgpu: New allocator for VA space""
This reverts commit 7eb42bc239dbd207208ff491c3fb65c3d83274d8.
The original commit was actually fine.
Change-Id: I564ce6530ac73fcfad17dcec9c53f0353b4f02d4
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/743300
(cherry picked from commit e99aa2485f8992eabe3556f3ebcb57bdc8ad91ff)
Reviewed-on: http://git-master/r/743301
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 f3b5544f..2e88726a 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 | ||
@@ -1532,6 +1533,7 @@ static int gk20a_probe(struct platform_device *dev) | |||
1532 | gr_gk20a_debugfs_init(gk20a); | 1533 | gr_gk20a_debugfs_init(gk20a); |
1533 | gk20a_pmu_debugfs_init(dev); | 1534 | gk20a_pmu_debugfs_init(dev); |
1534 | gk20a_cde_debugfs_init(dev); | 1535 | gk20a_cde_debugfs_init(dev); |
1536 | gk20a_alloc_debugfs_init(dev); | ||
1535 | #endif | 1537 | #endif |
1536 | 1538 | ||
1537 | gk20a_init_gr(gk20a); | 1539 | gk20a_init_gr(gk20a); |