diff options
author | Sunny He <suhe@nvidia.com> | 2017-08-11 17:43:28 -0400 |
---|---|---|
committer | Shu Zhong <shuz@nvidia.com> | 2017-08-11 17:57:26 -0400 |
commit | 36c07aaf5da4d0e739c5143ed00d4ca8a2263ce1 (patch) | |
tree | 2ed7e74b2ff0b3f8dc040e981f495d18f10cab4c /drivers/gpu/nvgpu/gp106/fb_gp106.h | |
parent | f8399cfa553b6fb6d82c7fa762c372f03bf59d5f (diff) |
Revert "gpu: nvgpu: Reorg fb HAL initialization"
Conflicts with gv100 changes
This reverts commit 63b74d4b768e0c96367d4983fdd8f1db1d317d01.
Change-Id: I5e6a1c93ff613daaa100dee436f4941af74f0ac4
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537671
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Tested-by: Shu Zhong <shuz@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/fb_gp106.h')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/fb_gp106.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.h b/drivers/gpu/nvgpu/gp106/fb_gp106.h index 99a70d7b..87b371e1 100644 --- a/drivers/gpu/nvgpu/gp106/fb_gp106.h +++ b/drivers/gpu/nvgpu/gp106/fb_gp106.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify it | 4 | * This program is free software; you can redistribute it and/or modify it |
5 | * under the terms and conditions of the GNU General Public License, | 5 | * under the terms and conditions of the GNU General Public License, |
@@ -15,5 +15,5 @@ | |||
15 | #define FB_GP106_H | 15 | #define FB_GP106_H |
16 | struct gpu_ops; | 16 | struct gpu_ops; |
17 | 17 | ||
18 | void gp106_fb_reset(struct gk20a *g); | 18 | void gp106_init_fb(struct gpu_ops *gops); |
19 | #endif | 19 | #endif |