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.c | |
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.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/fb_gp106.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp106/fb_gp106.c b/drivers/gpu/nvgpu/gp106/fb_gp106.c index 25055e79..5be7062d 100644 --- a/drivers/gpu/nvgpu/gp106/fb_gp106.c +++ b/drivers/gpu/nvgpu/gp106/fb_gp106.c | |||
@@ -21,7 +21,7 @@ | |||
21 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ | 21 | #define HW_SCRUB_TIMEOUT_DEFAULT 100 /* usec */ |
22 | #define HW_SCRUB_TIMEOUT_MAX 2000000 /* usec */ | 22 | #define HW_SCRUB_TIMEOUT_MAX 2000000 /* usec */ |
23 | 23 | ||
24 | void gp106_fb_reset(struct gk20a *g) | 24 | static void gp106_fb_reset(struct gk20a *g) |
25 | { | 25 | { |
26 | u32 val; | 26 | u32 val; |
27 | 27 | ||
@@ -40,3 +40,11 @@ void gp106_fb_reset(struct gk20a *g) | |||
40 | val &= ~fb_mmu_priv_level_mask_write_violation_m(); | 40 | val &= ~fb_mmu_priv_level_mask_write_violation_m(); |
41 | gk20a_writel(g, fb_mmu_priv_level_mask_r(), val); | 41 | gk20a_writel(g, fb_mmu_priv_level_mask_r(), val); |
42 | } | 42 | } |
43 | |||
44 | void gp106_init_fb(struct gpu_ops *gops) | ||
45 | { | ||
46 | gp10b_init_fb(gops); | ||
47 | |||
48 | gops->fb.init_fs_state = NULL; | ||
49 | gops->fb.reset = gp106_fb_reset; | ||
50 | } | ||