diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h | 14 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h | 14 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h | 12 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h | 12 |
9 files changed, 10 insertions, 55 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 2e57d01e..b642075e 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -92,7 +92,10 @@ int gk20a_init_mm_setup_hw(struct gk20a *g) | |||
92 | 92 | ||
93 | nvgpu_log_fn(g, " "); | 93 | nvgpu_log_fn(g, " "); |
94 | 94 | ||
95 | g->ops.fb.set_mmu_page_size(g); | 95 | if (g->ops.fb.set_mmu_page_size) { |
96 | g->ops.fb.set_mmu_page_size(g); | ||
97 | } | ||
98 | |||
96 | if (g->ops.fb.set_use_full_comp_tag_line) { | 99 | if (g->ops.fb.set_use_full_comp_tag_line) { |
97 | mm->use_full_comp_tag_line = | 100 | mm->use_full_comp_tag_line = |
98 | g->ops.fb.set_use_full_comp_tag_line(g); | 101 | g->ops.fb.set_use_full_comp_tag_line(g); |
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 37d0e91e..c1ec87eb 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -408,7 +408,7 @@ static const struct gpu_ops gp106_ops = { | |||
408 | .fb = { | 408 | .fb = { |
409 | .init_hw = gm20b_fb_init_hw, | 409 | .init_hw = gm20b_fb_init_hw, |
410 | .init_fs_state = gp106_fb_init_fs_state, | 410 | .init_fs_state = gp106_fb_init_fs_state, |
411 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, | 411 | .set_mmu_page_size = NULL, |
412 | .set_use_full_comp_tag_line = | 412 | .set_use_full_comp_tag_line = |
413 | gm20b_fb_set_use_full_comp_tag_line, | 413 | gm20b_fb_set_use_full_comp_tag_line, |
414 | .mmu_ctrl = gm20b_fb_mmu_ctrl, | 414 | .mmu_ctrl = gm20b_fb_mmu_ctrl, |
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index b7ad9743..2c6a57d4 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -369,7 +369,7 @@ static const struct gpu_ops gp10b_ops = { | |||
369 | .fb = { | 369 | .fb = { |
370 | .init_hw = gm20b_fb_init_hw, | 370 | .init_hw = gm20b_fb_init_hw, |
371 | .init_fs_state = fb_gm20b_init_fs_state, | 371 | .init_fs_state = fb_gm20b_init_fs_state, |
372 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, | 372 | .set_mmu_page_size = NULL, |
373 | .set_use_full_comp_tag_line = | 373 | .set_use_full_comp_tag_line = |
374 | gm20b_fb_set_use_full_comp_tag_line, | 374 | gm20b_fb_set_use_full_comp_tag_line, |
375 | .mmu_ctrl = gm20b_fb_mmu_ctrl, | 375 | .mmu_ctrl = gm20b_fb_mmu_ctrl, |
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 2a381f55..a4b8e836 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -470,7 +470,7 @@ static const struct gpu_ops gv100_ops = { | |||
470 | .fb = { | 470 | .fb = { |
471 | .init_hw = gv11b_fb_init_hw, | 471 | .init_hw = gv11b_fb_init_hw, |
472 | .init_fs_state = gp106_fb_init_fs_state, | 472 | .init_fs_state = gp106_fb_init_fs_state, |
473 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, | 473 | .set_mmu_page_size = NULL, |
474 | .set_use_full_comp_tag_line = | 474 | .set_use_full_comp_tag_line = |
475 | gm20b_fb_set_use_full_comp_tag_line, | 475 | gm20b_fb_set_use_full_comp_tag_line, |
476 | .mmu_ctrl = gm20b_fb_mmu_ctrl, | 476 | .mmu_ctrl = gm20b_fb_mmu_ctrl, |
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 2548cd16..2711ea97 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -433,7 +433,7 @@ static const struct gpu_ops gv11b_ops = { | |||
433 | .init_hw = gv11b_fb_init_hw, | 433 | .init_hw = gv11b_fb_init_hw, |
434 | .init_fs_state = gv11b_fb_init_fs_state, | 434 | .init_fs_state = gv11b_fb_init_fs_state, |
435 | .init_cbc = gv11b_fb_init_cbc, | 435 | .init_cbc = gv11b_fb_init_cbc, |
436 | .set_mmu_page_size = gm20b_fb_set_mmu_page_size, | 436 | .set_mmu_page_size = NULL, |
437 | .set_use_full_comp_tag_line = | 437 | .set_use_full_comp_tag_line = |
438 | gm20b_fb_set_use_full_comp_tag_line, | 438 | gm20b_fb_set_use_full_comp_tag_line, |
439 | .mmu_ctrl = gm20b_fb_mmu_ctrl, | 439 | .mmu_ctrl = gm20b_fb_mmu_ctrl, |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h index e2f7b9d2..df60beca 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_fb_gp106.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -76,18 +76,6 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r) | |||
76 | { | 76 | { |
77 | return (r >> 16U) & 0xffU; | 77 | return (r >> 16U) & 0xffU; |
78 | } | 78 | } |
79 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_v(u32 r) | ||
80 | { | ||
81 | return (r >> 11U) & 0x1U; | ||
82 | } | ||
83 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_true_f(void) | ||
84 | { | ||
85 | return 0x800U; | ||
86 | } | ||
87 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_false_f(void) | ||
88 | { | ||
89 | return 0x0U; | ||
90 | } | ||
91 | static inline u32 fb_priv_mmu_phy_secure_r(void) | 79 | static inline u32 fb_priv_mmu_phy_secure_r(void) |
92 | { | 80 | { |
93 | return 0x00100ce4U; | 81 | return 0x00100ce4U; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h index 5953abd9..c1ef4712 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_fb_gp10b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * copy of this software and associated documentation files (the "Software"), |
@@ -76,18 +76,6 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r) | |||
76 | { | 76 | { |
77 | return (r >> 16U) & 0xffU; | 77 | return (r >> 16U) & 0xffU; |
78 | } | 78 | } |
79 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_v(u32 r) | ||
80 | { | ||
81 | return (r >> 11U) & 0x1U; | ||
82 | } | ||
83 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_true_f(void) | ||
84 | { | ||
85 | return 0x800U; | ||
86 | } | ||
87 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_false_f(void) | ||
88 | { | ||
89 | return 0x0U; | ||
90 | } | ||
91 | static inline u32 fb_priv_mmu_phy_secure_r(void) | 79 | static inline u32 fb_priv_mmu_phy_secure_r(void) |
92 | { | 80 | { |
93 | return 0x00100ce4U; | 81 | return 0x00100ce4U; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h index 0f6a742e..80ff5dc2 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_fb_gv100.h | |||
@@ -152,18 +152,6 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r) | |||
152 | { | 152 | { |
153 | return (r >> 16U) & 0xffU; | 153 | return (r >> 16U) & 0xffU; |
154 | } | 154 | } |
155 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_v(u32 r) | ||
156 | { | ||
157 | return (r >> 11U) & 0x1U; | ||
158 | } | ||
159 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_true_f(void) | ||
160 | { | ||
161 | return 0x800U; | ||
162 | } | ||
163 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_false_f(void) | ||
164 | { | ||
165 | return 0x0U; | ||
166 | } | ||
167 | static inline u32 fb_mmu_ctrl_atomic_capability_mode_f(u32 v) | 155 | static inline u32 fb_mmu_ctrl_atomic_capability_mode_f(u32 v) |
168 | { | 156 | { |
169 | return (v & 0x3U) << 24U; | 157 | return (v & 0x3U) << 24U; |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h index 0982e3dc..86bdaf28 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h | |||
@@ -76,18 +76,6 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r) | |||
76 | { | 76 | { |
77 | return (r >> 16U) & 0xffU; | 77 | return (r >> 16U) & 0xffU; |
78 | } | 78 | } |
79 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_v(u32 r) | ||
80 | { | ||
81 | return (r >> 11U) & 0x1U; | ||
82 | } | ||
83 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_true_f(void) | ||
84 | { | ||
85 | return 0x800U; | ||
86 | } | ||
87 | static inline u32 fb_mmu_ctrl_use_pdb_big_page_size_false_f(void) | ||
88 | { | ||
89 | return 0x0U; | ||
90 | } | ||
91 | static inline u32 fb_priv_mmu_phy_secure_r(void) | 79 | static inline u32 fb_priv_mmu_phy_secure_r(void) |
92 | { | 80 | { |
93 | return 0x00100ce4U; | 81 | return 0x00100ce4U; |