diff options
author | Sunny He <suhe@nvidia.com> | 2017-08-11 17:41:33 -0400 |
---|---|---|
committer | Shu Zhong <shuz@nvidia.com> | 2017-08-11 17:57:15 -0400 |
commit | f8399cfa553b6fb6d82c7fa762c372f03bf59d5f (patch) | |
tree | 3966af83cf9abdf687667afe120cc6648a9ed360 /drivers/gpu/nvgpu/gp106/mm_gp106.h | |
parent | 8d63cd3995d4a650b478ad69d7e29ed2b1b2d927 (diff) |
Revert "gpu: nvgpu: Reorg mm HAL initialization"
Conflicts with gv100 changes
This reverts commit 8d63cd3995d4a650b478ad69d7e29ed2b1b2d927.
Change-Id: Ie2f88d281b2b87a9a794d79164a61c4d883626b7
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537668
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Tested-by: Shu Zhong <shuz@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/mm_gp106.h')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/mm_gp106.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp106/mm_gp106.h b/drivers/gpu/nvgpu/gp106/mm_gp106.h index 73b128a6..36a89a11 100644 --- a/drivers/gpu/nvgpu/gp106/mm_gp106.h +++ b/drivers/gpu/nvgpu/gp106/mm_gp106.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GP106 memory management | 2 | * GP106 memory management |
3 | * | 3 | * |
4 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
@@ -16,8 +16,8 @@ | |||
16 | #ifndef MM_GP106_H | 16 | #ifndef MM_GP106_H |
17 | #define MM_GP106_H | 17 | #define MM_GP106_H |
18 | 18 | ||
19 | struct gk20a; | 19 | struct gpu_ops; |
20 | 20 | ||
21 | size_t gp106_mm_get_vidmem_size(struct gk20a *g); | 21 | void gp106_init_mm(struct gpu_ops *gops); |
22 | 22 | ||
23 | #endif | 23 | #endif |