diff options
author | Bharat Nihalani <bnihalani@nvidia.com> | 2015-05-29 06:56:23 -0400 |
---|---|---|
committer | Bharat Nihalani <bnihalani@nvidia.com> | 2015-06-02 23:18:55 -0400 |
commit | 1d8fdf56959240622073dd771dd9bfccf31b8f8e (patch) | |
tree | 5c670e604825ddc25d6b6b0cce32cb3e7dc6871a /drivers/gpu/nvgpu/gk20a/gk20a.c | |
parent | 38cee4d7effe5a2079a08b3c9a216b3197893959 (diff) |
Revert "Revert "Revert "gpu: nvgpu: New allocator for VA space"""
This reverts commit ce1cf06b9a8eb6314ba0ca294e8cb430e1e141c0 since
it causes GPU pbdma interrupt to be generated.
Bug 200106514
Change-Id: If3ed9a914c4e3e7f3f98c6609c6dbf57e1eb9aad
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/749291
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index cc1b221d..697670c3 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -59,7 +59,6 @@ | |||
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" | ||
63 | #include "hal.h" | 62 | #include "hal.h" |
64 | #include "vgpu/vgpu.h" | 63 | #include "vgpu/vgpu.h" |
65 | 64 | ||
@@ -1534,7 +1533,6 @@ static int gk20a_probe(struct platform_device *dev) | |||
1534 | gr_gk20a_debugfs_init(gk20a); | 1533 | gr_gk20a_debugfs_init(gk20a); |
1535 | gk20a_pmu_debugfs_init(dev); | 1534 | gk20a_pmu_debugfs_init(dev); |
1536 | gk20a_cde_debugfs_init(dev); | 1535 | gk20a_cde_debugfs_init(dev); |
1537 | gk20a_alloc_debugfs_init(dev); | ||
1538 | #endif | 1536 | #endif |
1539 | 1537 | ||
1540 | gk20a_init_gr(gk20a); | 1538 | gk20a_init_gr(gk20a); |