diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-09-12 17:51:40 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-27 18:05:34 -0400 |
commit | f89ea110417e1c83cf21f495d6da7cdc8138a29f (patch) | |
tree | 198f25d08d650e5a42470eb1823b441c07d8b71f /drivers/gpu/nvgpu/gv100 | |
parent | e3ae03e17abd452c157545234348692364b4b9f6 (diff) |
gpu: nvgpu: Move FB reset to MC unit
FB reset is done by accessing MC register. Move the code to MC unit.
JIRA NVGPU-954
Change-Id: I1636887af805f016da5490af65e808f9ac015cde
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1823385
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv100')
-rw-r--r-- | drivers/gpu/nvgpu/gv100/hal_gv100.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index aae2bf73..4f50b13f 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "common/ptimer/ptimer_gk20a.h" | 31 | #include "common/ptimer/ptimer_gk20a.h" |
32 | #include "common/fb/fb_gm20b.h" | 32 | #include "common/fb/fb_gm20b.h" |
33 | #include "common/fb/fb_gp10b.h" | 33 | #include "common/fb/fb_gp10b.h" |
34 | #include "common/fb/fb_gp106.h" | ||
34 | #include "common/fb/fb_gv11b.h" | 35 | #include "common/fb/fb_gv11b.h" |
35 | #include "common/fb/fb_gv100.h" | 36 | #include "common/fb/fb_gv100.h" |
36 | #include "common/xve/xve_gp106.h" | 37 | #include "common/xve/xve_gp106.h" |
@@ -467,9 +468,8 @@ static const struct gpu_ops gv100_ops = { | |||
467 | .set_debug_mode = gm20b_gr_set_debug_mode, | 468 | .set_debug_mode = gm20b_gr_set_debug_mode, |
468 | }, | 469 | }, |
469 | .fb = { | 470 | .fb = { |
470 | .reset = gv100_fb_reset, | ||
471 | .init_hw = gv11b_fb_init_hw, | 471 | .init_hw = gv11b_fb_init_hw, |
472 | .init_fs_state = NULL, | 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 = gm20b_fb_set_mmu_page_size, |
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, |
@@ -819,6 +819,7 @@ static const struct gpu_ops gv100_ops = { | |||
819 | gv100_mc_is_stall_and_eng_intr_pending, | 819 | gv100_mc_is_stall_and_eng_intr_pending, |
820 | .reset_mask = gv100_mc_reset_mask, | 820 | .reset_mask = gv100_mc_reset_mask, |
821 | .is_enabled = gm20b_mc_is_enabled, | 821 | .is_enabled = gm20b_mc_is_enabled, |
822 | .fb_reset = NULL, | ||
822 | }, | 823 | }, |
823 | .debug = { | 824 | .debug = { |
824 | .show_dump = gk20a_debug_show_dump, | 825 | .show_dump = gk20a_debug_show_dump, |