From a6499fb9ceddd9ea52cf7e67789a64131545295c Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 16 Aug 2018 14:27:35 -0700 Subject: gpu: nvgpu: Bump FB gk20a code to gm20b Move all code from fb_gk20a.c to fb_gm20b.c. Change-Id: I87fbdfee76599e019564d66bf248aaffcf978498 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1801422 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b') 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 @@ #include "common/bus/bus_gp10b.h" #include "common/priv_ring/priv_ring_gm20b.h" #include "common/priv_ring/priv_ring_gp10b.h" -#include "common/fb/fb_gk20a.h" #include "common/fb/fb_gm20b.h" #include "common/fb/fb_gp10b.h" #include "common/therm/therm_gm20b.h" @@ -368,8 +367,8 @@ static const struct gpu_ops gp10b_ops = { .set_debug_mode = gm20b_gr_set_debug_mode, }, .fb = { - .reset = fb_gk20a_reset, - .init_hw = gk20a_fb_init_hw, + .reset = gm20b_fb_reset, + .init_hw = gm20b_fb_init_hw, .init_fs_state = fb_gm20b_init_fs_state, .set_mmu_page_size = gm20b_fb_set_mmu_page_size, .set_use_full_comp_tag_line = @@ -386,7 +385,7 @@ static const struct gpu_ops gp10b_ops = { .read_wpr_info = gm20b_fb_read_wpr_info, .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, .set_debug_mode = gm20b_fb_set_debug_mode, - .tlb_invalidate = gk20a_fb_tlb_invalidate, + .tlb_invalidate = gm20b_fb_tlb_invalidate, .mem_unlock = NULL, }, .clock_gating = { -- cgit v1.2.2