diff options
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/Makefile.sources | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gk20a.c | 124 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gk20a.h | 33 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gm20b.c | 92 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gm20b.h | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/fb/fb_gv11b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/hal_gm20b.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 1 |
14 files changed, 112 insertions, 182 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index f9378370..e74fa2bb 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -31,7 +31,6 @@ nvgpu-y += common/bus/bus_gk20a.o \ | |||
31 | common/priv_ring/priv_ring_gp10b.o \ | 31 | common/priv_ring/priv_ring_gp10b.o \ |
32 | common/ptimer/ptimer.o \ | 32 | common/ptimer/ptimer.o \ |
33 | common/ptimer/ptimer_gk20a.o \ | 33 | common/ptimer/ptimer_gk20a.o \ |
34 | common/fb/fb_gk20a.o \ | ||
35 | common/fb/fb_gm20b.o \ | 34 | common/fb/fb_gm20b.o \ |
36 | common/fb/fb_gp10b.o \ | 35 | common/fb/fb_gp10b.o \ |
37 | common/fb/fb_gp106.o \ | 36 | common/fb/fb_gp106.o \ |
diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index f1ba7f76..f09ebf78 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources | |||
@@ -62,7 +62,6 @@ srcs := os/posix/nvgpu.c \ | |||
62 | common/bus/bus_gv100.c \ | 62 | common/bus/bus_gv100.c \ |
63 | common/priv_ring/priv_ring_gm20b.c \ | 63 | common/priv_ring/priv_ring_gm20b.c \ |
64 | common/priv_ring/priv_ring_gp10b.c \ | 64 | common/priv_ring/priv_ring_gp10b.c \ |
65 | common/fb/fb_gk20a.c \ | ||
66 | common/fb/fb_gm20b.c \ | 65 | common/fb/fb_gm20b.c \ |
67 | common/fb/fb_gp10b.c \ | 66 | common/fb/fb_gp10b.c \ |
68 | common/fb/fb_gp106.c \ | 67 | common/fb/fb_gp106.c \ |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c b/drivers/gpu/nvgpu/common/fb/fb_gk20a.c deleted file mode 100644 index 78523965..00000000 --- a/drivers/gpu/nvgpu/common/fb/fb_gk20a.c +++ /dev/null | |||
@@ -1,124 +0,0 @@ | |||
1 | /* | ||
2 | * GK20A memory interface | ||
3 | * | ||
4 | * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. | ||
5 | * | ||
6 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
7 | * copy of this software and associated documentation files (the "Software"), | ||
8 | * to deal in the Software without restriction, including without limitation | ||
9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
10 | * and/or sell copies of the Software, and to permit persons to whom the | ||
11 | * Software is furnished to do so, subject to the following conditions: | ||
12 | * | ||
13 | * The above copyright notice and this permission notice shall be included in | ||
14 | * all copies or substantial portions of the Software. | ||
15 | * | ||
16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
19 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
20 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
21 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
22 | * DEALINGS IN THE SOFTWARE. | ||
23 | */ | ||
24 | |||
25 | #include <trace/events/gk20a.h> | ||
26 | |||
27 | #include "gk20a/gk20a.h" | ||
28 | |||
29 | #include "fb_gk20a.h" | ||
30 | |||
31 | #include <nvgpu/timers.h> | ||
32 | #include <nvgpu/io.h> | ||
33 | #include <nvgpu/utils.h> | ||
34 | |||
35 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | ||
36 | #include <nvgpu/hw/gk20a/hw_fb_gk20a.h> | ||
37 | |||
38 | void fb_gk20a_reset(struct gk20a *g) | ||
39 | { | ||
40 | u32 val; | ||
41 | |||
42 | nvgpu_log_info(g, "reset gk20a fb"); | ||
43 | |||
44 | val = gk20a_readl(g, mc_elpg_enable_r()); | ||
45 | val |= mc_elpg_enable_xbar_enabled_f() | ||
46 | | mc_elpg_enable_pfb_enabled_f() | ||
47 | | mc_elpg_enable_hub_enabled_f(); | ||
48 | gk20a_writel(g, mc_elpg_enable_r(), val); | ||
49 | } | ||
50 | |||
51 | void gk20a_fb_init_hw(struct gk20a *g) | ||
52 | { | ||
53 | u32 addr = nvgpu_mem_get_addr(g, &g->mm.sysmem_flush) >> 8; | ||
54 | |||
55 | gk20a_writel(g, fb_niso_flush_sysmem_addr_r(), addr); | ||
56 | } | ||
57 | |||
58 | void gk20a_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb) | ||
59 | { | ||
60 | struct nvgpu_timeout timeout; | ||
61 | u32 addr_lo; | ||
62 | u32 data; | ||
63 | |||
64 | nvgpu_log_fn(g, " "); | ||
65 | |||
66 | /* pagetables are considered sw states which are preserved after | ||
67 | prepare_poweroff. When gk20a deinit releases those pagetables, | ||
68 | common code in vm unmap path calls tlb invalidate that touches | ||
69 | hw. Use the power_on flag to skip tlb invalidation when gpu | ||
70 | power is turned off */ | ||
71 | |||
72 | if (!g->power_on) { | ||
73 | return; | ||
74 | } | ||
75 | |||
76 | addr_lo = u64_lo32(nvgpu_mem_get_addr(g, pdb) >> 12); | ||
77 | |||
78 | nvgpu_mutex_acquire(&g->mm.tlb_lock); | ||
79 | |||
80 | trace_gk20a_mm_tlb_invalidate(g->name); | ||
81 | |||
82 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); | ||
83 | |||
84 | do { | ||
85 | data = gk20a_readl(g, fb_mmu_ctrl_r()); | ||
86 | if (fb_mmu_ctrl_pri_fifo_space_v(data) != 0) { | ||
87 | break; | ||
88 | } | ||
89 | nvgpu_udelay(2); | ||
90 | } while (!nvgpu_timeout_expired_msg(&timeout, | ||
91 | "wait mmu fifo space")); | ||
92 | |||
93 | if (nvgpu_timeout_peek_expired(&timeout)) { | ||
94 | goto out; | ||
95 | } | ||
96 | |||
97 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); | ||
98 | |||
99 | gk20a_writel(g, fb_mmu_invalidate_pdb_r(), | ||
100 | fb_mmu_invalidate_pdb_addr_f(addr_lo) | | ||
101 | nvgpu_aperture_mask(g, pdb, | ||
102 | fb_mmu_invalidate_pdb_aperture_sys_mem_f(), | ||
103 | fb_mmu_invalidate_pdb_aperture_sys_mem_f(), | ||
104 | fb_mmu_invalidate_pdb_aperture_vid_mem_f())); | ||
105 | |||
106 | gk20a_writel(g, fb_mmu_invalidate_r(), | ||
107 | fb_mmu_invalidate_all_va_true_f() | | ||
108 | fb_mmu_invalidate_trigger_true_f()); | ||
109 | |||
110 | do { | ||
111 | data = gk20a_readl(g, fb_mmu_ctrl_r()); | ||
112 | if (fb_mmu_ctrl_pri_fifo_empty_v(data) != | ||
113 | fb_mmu_ctrl_pri_fifo_empty_false_f()) { | ||
114 | break; | ||
115 | } | ||
116 | nvgpu_udelay(2); | ||
117 | } while (!nvgpu_timeout_expired_msg(&timeout, | ||
118 | "wait mmu invalidate")); | ||
119 | |||
120 | trace_gk20a_mm_tlb_invalidate_done(g->name); | ||
121 | |||
122 | out: | ||
123 | nvgpu_mutex_release(&g->mm.tlb_lock); | ||
124 | } | ||
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gk20a.h b/drivers/gpu/nvgpu/common/fb/fb_gk20a.h deleted file mode 100644 index 072c9027..00000000 --- a/drivers/gpu/nvgpu/common/fb/fb_gk20a.h +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
5 | * copy of this software and associated documentation files (the "Software"), | ||
6 | * to deal in the Software without restriction, including without limitation | ||
7 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
8 | * and/or sell copies of the Software, and to permit persons to whom the | ||
9 | * Software is furnished to do so, subject to the following conditions: | ||
10 | * | ||
11 | * The above copyright notice and this permission notice shall be included in | ||
12 | * all copies or substantial portions of the Software. | ||
13 | * | ||
14 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
15 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
16 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
17 | * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
18 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
19 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
20 | * DEALINGS IN THE SOFTWARE. | ||
21 | */ | ||
22 | |||
23 | #ifndef FB_GK20A_H | ||
24 | #define FB_GK20A_H | ||
25 | |||
26 | struct gk20a; | ||
27 | struct nvgpu_mem; | ||
28 | |||
29 | void fb_gk20a_reset(struct gk20a *g); | ||
30 | void gk20a_fb_init_hw(struct gk20a *g); | ||
31 | void gk20a_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb); | ||
32 | |||
33 | #endif | ||
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c index 4ad8b722..b4756546 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.c | |||
@@ -22,22 +22,112 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <trace/events/gk20a.h> | ||
26 | |||
25 | #include <nvgpu/sizes.h> | 27 | #include <nvgpu/sizes.h> |
26 | #include <nvgpu/utils.h> | 28 | #include <nvgpu/utils.h> |
27 | 29 | ||
28 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
29 | 31 | ||
30 | #include "fb_gk20a.h" | ||
31 | #include "fb_gm20b.h" | 32 | #include "fb_gm20b.h" |
32 | 33 | ||
33 | #include <nvgpu/io.h> | 34 | #include <nvgpu/io.h> |
34 | #include <nvgpu/timers.h> | 35 | #include <nvgpu/timers.h> |
35 | 36 | ||
37 | #include <nvgpu/hw/gm20b/hw_mc_gm20b.h> | ||
36 | #include <nvgpu/hw/gm20b/hw_fb_gm20b.h> | 38 | #include <nvgpu/hw/gm20b/hw_fb_gm20b.h> |
37 | 39 | ||
38 | #define VPR_INFO_FETCH_WAIT (5) | 40 | #define VPR_INFO_FETCH_WAIT (5) |
39 | #define WPR_INFO_ADDR_ALIGNMENT 0x0000000c | 41 | #define WPR_INFO_ADDR_ALIGNMENT 0x0000000c |
40 | 42 | ||
43 | void gm20b_fb_reset(struct gk20a *g) | ||
44 | { | ||
45 | u32 val; | ||
46 | |||
47 | nvgpu_log_info(g, "reset gk20a fb"); | ||
48 | |||
49 | val = gk20a_readl(g, mc_elpg_enable_r()); | ||
50 | val |= mc_elpg_enable_xbar_enabled_f() | ||
51 | | mc_elpg_enable_pfb_enabled_f() | ||
52 | | mc_elpg_enable_hub_enabled_f(); | ||
53 | gk20a_writel(g, mc_elpg_enable_r(), val); | ||
54 | } | ||
55 | |||
56 | void gm20b_fb_init_hw(struct gk20a *g) | ||
57 | { | ||
58 | u32 addr = nvgpu_mem_get_addr(g, &g->mm.sysmem_flush) >> 8; | ||
59 | |||
60 | gk20a_writel(g, fb_niso_flush_sysmem_addr_r(), addr); | ||
61 | } | ||
62 | |||
63 | void gm20b_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb) | ||
64 | { | ||
65 | struct nvgpu_timeout timeout; | ||
66 | u32 addr_lo; | ||
67 | u32 data; | ||
68 | |||
69 | nvgpu_log_fn(g, " "); | ||
70 | |||
71 | /* pagetables are considered sw states which are preserved after | ||
72 | prepare_poweroff. When gk20a deinit releases those pagetables, | ||
73 | common code in vm unmap path calls tlb invalidate that touches | ||
74 | hw. Use the power_on flag to skip tlb invalidation when gpu | ||
75 | power is turned off */ | ||
76 | |||
77 | if (!g->power_on) { | ||
78 | return; | ||
79 | } | ||
80 | |||
81 | addr_lo = u64_lo32(nvgpu_mem_get_addr(g, pdb) >> 12); | ||
82 | |||
83 | nvgpu_mutex_acquire(&g->mm.tlb_lock); | ||
84 | |||
85 | trace_gk20a_mm_tlb_invalidate(g->name); | ||
86 | |||
87 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); | ||
88 | |||
89 | do { | ||
90 | data = gk20a_readl(g, fb_mmu_ctrl_r()); | ||
91 | if (fb_mmu_ctrl_pri_fifo_space_v(data) != 0) { | ||
92 | break; | ||
93 | } | ||
94 | nvgpu_udelay(2); | ||
95 | } while (!nvgpu_timeout_expired_msg(&timeout, | ||
96 | "wait mmu fifo space")); | ||
97 | |||
98 | if (nvgpu_timeout_peek_expired(&timeout)) { | ||
99 | goto out; | ||
100 | } | ||
101 | |||
102 | nvgpu_timeout_init(g, &timeout, 1000, NVGPU_TIMER_RETRY_TIMER); | ||
103 | |||
104 | gk20a_writel(g, fb_mmu_invalidate_pdb_r(), | ||
105 | fb_mmu_invalidate_pdb_addr_f(addr_lo) | | ||
106 | nvgpu_aperture_mask(g, pdb, | ||
107 | fb_mmu_invalidate_pdb_aperture_sys_mem_f(), | ||
108 | fb_mmu_invalidate_pdb_aperture_sys_mem_f(), | ||
109 | fb_mmu_invalidate_pdb_aperture_vid_mem_f())); | ||
110 | |||
111 | gk20a_writel(g, fb_mmu_invalidate_r(), | ||
112 | fb_mmu_invalidate_all_va_true_f() | | ||
113 | fb_mmu_invalidate_trigger_true_f()); | ||
114 | |||
115 | do { | ||
116 | data = gk20a_readl(g, fb_mmu_ctrl_r()); | ||
117 | if (fb_mmu_ctrl_pri_fifo_empty_v(data) != | ||
118 | fb_mmu_ctrl_pri_fifo_empty_false_f()) { | ||
119 | break; | ||
120 | } | ||
121 | nvgpu_udelay(2); | ||
122 | } while (!nvgpu_timeout_expired_msg(&timeout, | ||
123 | "wait mmu invalidate")); | ||
124 | |||
125 | trace_gk20a_mm_tlb_invalidate_done(g->name); | ||
126 | |||
127 | out: | ||
128 | nvgpu_mutex_release(&g->mm.tlb_lock); | ||
129 | } | ||
130 | |||
41 | void fb_gm20b_init_fs_state(struct gk20a *g) | 131 | void fb_gm20b_init_fs_state(struct gk20a *g) |
42 | { | 132 | { |
43 | nvgpu_log_info(g, "initialize gm20b fb"); | 133 | nvgpu_log_info(g, "initialize gm20b fb"); |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gm20b.h b/drivers/gpu/nvgpu/common/fb/fb_gm20b.h index eb868b01..95991432 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gm20b.h +++ b/drivers/gpu/nvgpu/common/fb/fb_gm20b.h | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GM20B FB | 2 | * GM20B FB |
3 | * | 3 | * |
4 | * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -22,12 +22,18 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #ifndef _NVHOST_GM20B_FB | 25 | #ifndef NVGPU_FB_GM20B |
26 | #define _NVHOST_GM20B_FB | 26 | #define NVGPU_FB_GM20B |
27 | |||
28 | #include <nvgpu/types.h> | ||
27 | 29 | ||
28 | struct gk20a; | 30 | struct gk20a; |
29 | struct wpr_carveout_info; | 31 | struct wpr_carveout_info; |
32 | struct nvgpu_mem; | ||
30 | 33 | ||
34 | void gm20b_fb_reset(struct gk20a *g); | ||
35 | void gm20b_fb_init_hw(struct gk20a *g); | ||
36 | void gm20b_fb_tlb_invalidate(struct gk20a *g, struct nvgpu_mem *pdb); | ||
31 | void fb_gm20b_init_fs_state(struct gk20a *g); | 37 | void fb_gm20b_init_fs_state(struct gk20a *g); |
32 | void gm20b_fb_set_mmu_page_size(struct gk20a *g); | 38 | void gm20b_fb_set_mmu_page_size(struct gk20a *g); |
33 | bool gm20b_fb_set_use_full_comp_tag_line(struct gk20a *g); | 39 | bool gm20b_fb_set_use_full_comp_tag_line(struct gk20a *g); |
diff --git a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c index e6996321..c46d3976 100644 --- a/drivers/gpu/nvgpu/common/fb/fb_gv11b.c +++ b/drivers/gpu/nvgpu/common/fb/fb_gv11b.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include "gv11b/fifo_gv11b.h" | 40 | #include "gv11b/fifo_gv11b.h" |
41 | #include "gv11b/ce_gv11b.h" | 41 | #include "gv11b/ce_gv11b.h" |
42 | 42 | ||
43 | #include "fb_gk20a.h" | 43 | #include "fb_gm20b.h" |
44 | #include "fb_gp10b.h" | 44 | #include "fb_gp10b.h" |
45 | #include "fb_gv11b.h" | 45 | #include "fb_gv11b.h" |
46 | 46 | ||
@@ -64,7 +64,7 @@ static void gv11b_init_nvlink_soc_credits(struct gk20a *g) | |||
64 | 64 | ||
65 | void gv11b_fb_init_hw(struct gk20a *g) | 65 | void gv11b_fb_init_hw(struct gk20a *g) |
66 | { | 66 | { |
67 | gk20a_fb_init_hw(g); | 67 | gm20b_fb_init_hw(g); |
68 | 68 | ||
69 | g->ops.fb.enable_hub_intr(g); | 69 | g->ops.fb.enable_hub_intr(g); |
70 | } | 70 | } |
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c index 3b80ede0..51ddb561 100644 --- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include "common/bus/bus_gk20a.h" | 27 | #include "common/bus/bus_gk20a.h" |
28 | #include "common/priv_ring/priv_ring_gm20b.h" | 28 | #include "common/priv_ring/priv_ring_gm20b.h" |
29 | #include "common/ptimer/ptimer_gk20a.h" | 29 | #include "common/ptimer/ptimer_gk20a.h" |
30 | #include "common/fb/fb_gk20a.h" | ||
31 | #include "common/fb/fb_gm20b.h" | 30 | #include "common/fb/fb_gm20b.h" |
32 | #include "common/therm/therm_gm20b.h" | 31 | #include "common/therm/therm_gm20b.h" |
33 | #include "common/therm/therm_gm20b.h" | 32 | #include "common/therm/therm_gm20b.h" |
@@ -332,8 +331,8 @@ static const struct gpu_ops gm20b_ops = { | |||
332 | .set_debug_mode = gm20b_gr_set_debug_mode, | 331 | .set_debug_mode = gm20b_gr_set_debug_mode, |
333 | }, | 332 | }, |
334 | .fb = { | 333 | .fb = { |
335 | .reset = fb_gk20a_reset, | 334 | .reset = gm20b_fb_reset, |
336 | .init_hw = gk20a_fb_init_hw, | 335 | .init_hw = gm20b_fb_init_hw, |
337 | .init_fs_state = fb_gm20b_init_fs_state, | 336 | .init_fs_state = fb_gm20b_init_fs_state, |
338 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, | 337 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, |
339 | .set_use_full_comp_tag_line = | 338 | .set_use_full_comp_tag_line = |
@@ -350,7 +349,7 @@ static const struct gpu_ops gm20b_ops = { | |||
350 | .read_wpr_info = gm20b_fb_read_wpr_info, | 349 | .read_wpr_info = gm20b_fb_read_wpr_info, |
351 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, | 350 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, |
352 | .set_debug_mode = gm20b_fb_set_debug_mode, | 351 | .set_debug_mode = gm20b_fb_set_debug_mode, |
353 | .tlb_invalidate = gk20a_fb_tlb_invalidate, | 352 | .tlb_invalidate = gm20b_fb_tlb_invalidate, |
354 | .mem_unlock = NULL, | 353 | .mem_unlock = NULL, |
355 | }, | 354 | }, |
356 | .clock_gating = { | 355 | .clock_gating = { |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 42ff647c..f1a701a0 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "common/bus/bus_gp10b.h" | 29 | #include "common/bus/bus_gp10b.h" |
30 | #include "common/priv_ring/priv_ring_gm20b.h" | 30 | #include "common/priv_ring/priv_ring_gm20b.h" |
31 | #include "common/priv_ring/priv_ring_gp10b.h" | 31 | #include "common/priv_ring/priv_ring_gp10b.h" |
32 | #include "common/fb/fb_gk20a.h" | ||
33 | #include "common/fb/fb_gp10b.h" | 32 | #include "common/fb/fb_gp10b.h" |
34 | #include "common/fb/fb_gm20b.h" | 33 | #include "common/fb/fb_gm20b.h" |
35 | #include "common/fb/fb_gp106.h" | 34 | #include "common/fb/fb_gp106.h" |
@@ -407,7 +406,7 @@ static const struct gpu_ops gp106_ops = { | |||
407 | }, | 406 | }, |
408 | .fb = { | 407 | .fb = { |
409 | .reset = gp106_fb_reset, | 408 | .reset = gp106_fb_reset, |
410 | .init_hw = gk20a_fb_init_hw, | 409 | .init_hw = gm20b_fb_init_hw, |
411 | .init_fs_state = NULL, | 410 | .init_fs_state = NULL, |
412 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, | 411 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, |
413 | .set_use_full_comp_tag_line = | 412 | .set_use_full_comp_tag_line = |
@@ -424,7 +423,7 @@ static const struct gpu_ops gp106_ops = { | |||
424 | .read_wpr_info = gm20b_fb_read_wpr_info, | 423 | .read_wpr_info = gm20b_fb_read_wpr_info, |
425 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, | 424 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, |
426 | .set_debug_mode = gm20b_fb_set_debug_mode, | 425 | .set_debug_mode = gm20b_fb_set_debug_mode, |
427 | .tlb_invalidate = gk20a_fb_tlb_invalidate, | 426 | .tlb_invalidate = gm20b_fb_tlb_invalidate, |
428 | .mem_unlock = NULL, | 427 | .mem_unlock = NULL, |
429 | }, | 428 | }, |
430 | .clock_gating = { | 429 | .clock_gating = { |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 9e42c6ba..25466e7b 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "common/bus/bus_gp10b.h" | 29 | #include "common/bus/bus_gp10b.h" |
30 | #include "common/priv_ring/priv_ring_gm20b.h" | 30 | #include "common/priv_ring/priv_ring_gm20b.h" |
31 | #include "common/priv_ring/priv_ring_gp10b.h" | 31 | #include "common/priv_ring/priv_ring_gp10b.h" |
32 | #include "common/fb/fb_gk20a.h" | ||
33 | #include "common/fb/fb_gm20b.h" | 32 | #include "common/fb/fb_gm20b.h" |
34 | #include "common/fb/fb_gp10b.h" | 33 | #include "common/fb/fb_gp10b.h" |
35 | #include "common/therm/therm_gm20b.h" | 34 | #include "common/therm/therm_gm20b.h" |
@@ -368,8 +367,8 @@ static const struct gpu_ops gp10b_ops = { | |||
368 | .set_debug_mode = gm20b_gr_set_debug_mode, | 367 | .set_debug_mode = gm20b_gr_set_debug_mode, |
369 | }, | 368 | }, |
370 | .fb = { | 369 | .fb = { |
371 | .reset = fb_gk20a_reset, | 370 | .reset = gm20b_fb_reset, |
372 | .init_hw = gk20a_fb_init_hw, | 371 | .init_hw = gm20b_fb_init_hw, |
373 | .init_fs_state = fb_gm20b_init_fs_state, | 372 | .init_fs_state = fb_gm20b_init_fs_state, |
374 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, | 373 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, |
375 | .set_use_full_comp_tag_line = | 374 | .set_use_full_comp_tag_line = |
@@ -386,7 +385,7 @@ static const struct gpu_ops gp10b_ops = { | |||
386 | .read_wpr_info = gm20b_fb_read_wpr_info, | 385 | .read_wpr_info = gm20b_fb_read_wpr_info, |
387 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, | 386 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, |
388 | .set_debug_mode = gm20b_fb_set_debug_mode, | 387 | .set_debug_mode = gm20b_fb_set_debug_mode, |
389 | .tlb_invalidate = gk20a_fb_tlb_invalidate, | 388 | .tlb_invalidate = gm20b_fb_tlb_invalidate, |
390 | .mem_unlock = NULL, | 389 | .mem_unlock = NULL, |
391 | }, | 390 | }, |
392 | .clock_gating = { | 391 | .clock_gating = { |
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 0529fd91..6f07015d 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "common/priv_ring/priv_ring_gp10b.h" | 29 | #include "common/priv_ring/priv_ring_gp10b.h" |
30 | #include "common/clock_gating/gv100_gating_reglist.h" | 30 | #include "common/clock_gating/gv100_gating_reglist.h" |
31 | #include "common/ptimer/ptimer_gk20a.h" | 31 | #include "common/ptimer/ptimer_gk20a.h" |
32 | #include "common/fb/fb_gk20a.h" | ||
33 | #include "common/fb/fb_gm20b.h" | 32 | #include "common/fb/fb_gm20b.h" |
34 | #include "common/fb/fb_gp10b.h" | 33 | #include "common/fb/fb_gp10b.h" |
35 | #include "common/fb/fb_gv11b.h" | 34 | #include "common/fb/fb_gv11b.h" |
@@ -480,7 +479,7 @@ static const struct gpu_ops gv100_ops = { | |||
480 | .read_wpr_info = gm20b_fb_read_wpr_info, | 479 | .read_wpr_info = gm20b_fb_read_wpr_info, |
481 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, | 480 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, |
482 | .set_debug_mode = gm20b_fb_set_debug_mode, | 481 | .set_debug_mode = gm20b_fb_set_debug_mode, |
483 | .tlb_invalidate = gk20a_fb_tlb_invalidate, | 482 | .tlb_invalidate = gm20b_fb_tlb_invalidate, |
484 | .hub_isr = gv11b_fb_hub_isr, | 483 | .hub_isr = gv11b_fb_hub_isr, |
485 | .mem_unlock = gv100_fb_memory_unlock, | 484 | .mem_unlock = gv100_fb_memory_unlock, |
486 | .init_nvlink = gv100_fb_init_nvlink, | 485 | .init_nvlink = gv100_fb_init_nvlink, |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index d87975d1..8d3fb86b 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "common/priv_ring/priv_ring_gp10b.h" | 29 | #include "common/priv_ring/priv_ring_gp10b.h" |
30 | #include "common/clock_gating/gv11b_gating_reglist.h" | 30 | #include "common/clock_gating/gv11b_gating_reglist.h" |
31 | #include "common/ptimer/ptimer_gk20a.h" | 31 | #include "common/ptimer/ptimer_gk20a.h" |
32 | #include "common/fb/fb_gk20a.h" | ||
33 | #include "common/fb/fb_gm20b.h" | 32 | #include "common/fb/fb_gm20b.h" |
34 | #include "common/fb/fb_gp10b.h" | 33 | #include "common/fb/fb_gp10b.h" |
35 | #include "common/fb/fb_gv11b.h" | 34 | #include "common/fb/fb_gv11b.h" |
@@ -444,7 +443,7 @@ static const struct gpu_ops gv11b_ops = { | |||
444 | .read_wpr_info = gm20b_fb_read_wpr_info, | 443 | .read_wpr_info = gm20b_fb_read_wpr_info, |
445 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, | 444 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, |
446 | .set_debug_mode = gm20b_fb_set_debug_mode, | 445 | .set_debug_mode = gm20b_fb_set_debug_mode, |
447 | .tlb_invalidate = gk20a_fb_tlb_invalidate, | 446 | .tlb_invalidate = gm20b_fb_tlb_invalidate, |
448 | .hub_isr = gv11b_fb_hub_isr, | 447 | .hub_isr = gv11b_fb_hub_isr, |
449 | .handle_replayable_fault = gv11b_fb_handle_replayable_mmu_fault, | 448 | .handle_replayable_fault = gv11b_fb_handle_replayable_mmu_fault, |
450 | .mem_unlock = NULL, | 449 | .mem_unlock = NULL, |
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index fa8395eb..7500e92e 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "common/priv_ring/priv_ring_gm20b.h" | 25 | #include "common/priv_ring/priv_ring_gm20b.h" |
26 | #include "common/priv_ring/priv_ring_gp10b.h" | 26 | #include "common/priv_ring/priv_ring_gp10b.h" |
27 | #include "common/clock_gating/gp10b_gating_reglist.h" | 27 | #include "common/clock_gating/gp10b_gating_reglist.h" |
28 | #include "common/fb/fb_gk20a.h" | ||
29 | #include "common/fb/fb_gm20b.h" | 28 | #include "common/fb/fb_gm20b.h" |
30 | #include "common/fb/fb_gp10b.h" | 29 | #include "common/fb/fb_gp10b.h" |
31 | #include "common/therm/therm_gm20b.h" | 30 | #include "common/therm/therm_gm20b.h" |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index 66f25e24..fb118f16 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -25,7 +25,6 @@ | |||
25 | #include "common/priv_ring/priv_ring_gm20b.h" | 25 | #include "common/priv_ring/priv_ring_gm20b.h" |
26 | #include "common/priv_ring/priv_ring_gp10b.h" | 26 | #include "common/priv_ring/priv_ring_gp10b.h" |
27 | #include "common/clock_gating/gv11b_gating_reglist.h" | 27 | #include "common/clock_gating/gv11b_gating_reglist.h" |
28 | #include "common/fb/fb_gk20a.h" | ||
29 | #include "common/fb/fb_gm20b.h" | 28 | #include "common/fb/fb_gm20b.h" |
30 | #include "common/fb/fb_gp10b.h" | 29 | #include "common/fb/fb_gp10b.h" |
31 | #include "common/fb/fb_gv11b.h" | 30 | #include "common/fb/fb_gv11b.h" |