From f89ea110417e1c83cf21f495d6da7cdc8138a29f Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Wed, 12 Sep 2018 14:51:40 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1823385 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv100/hal_gv100.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/gv100') 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 @@ #include "common/ptimer/ptimer_gk20a.h" #include "common/fb/fb_gm20b.h" #include "common/fb/fb_gp10b.h" +#include "common/fb/fb_gp106.h" #include "common/fb/fb_gv11b.h" #include "common/fb/fb_gv100.h" #include "common/xve/xve_gp106.h" @@ -467,9 +468,8 @@ static const struct gpu_ops gv100_ops = { .set_debug_mode = gm20b_gr_set_debug_mode, }, .fb = { - .reset = gv100_fb_reset, .init_hw = gv11b_fb_init_hw, - .init_fs_state = NULL, + .init_fs_state = gp106_fb_init_fs_state, .set_mmu_page_size = gm20b_fb_set_mmu_page_size, .set_use_full_comp_tag_line = gm20b_fb_set_use_full_comp_tag_line, @@ -819,6 +819,7 @@ static const struct gpu_ops gv100_ops = { gv100_mc_is_stall_and_eng_intr_pending, .reset_mask = gv100_mc_reset_mask, .is_enabled = gm20b_mc_is_enabled, + .fb_reset = NULL, }, .debug = { .show_dump = gk20a_debug_show_dump, -- cgit v1.2.2