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/gp106/hal_gp106.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106') 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 @@ #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_gp10b.h" #include "common/fb/fb_gm20b.h" #include "common/fb/fb_gp106.h" @@ -407,7 +406,7 @@ static const struct gpu_ops gp106_ops = { }, .fb = { .reset = gp106_fb_reset, - .init_hw = gk20a_fb_init_hw, + .init_hw = gm20b_fb_init_hw, .init_fs_state = NULL, .set_mmu_page_size = gm20b_fb_set_mmu_page_size, .set_use_full_comp_tag_line = @@ -424,7 +423,7 @@ static const struct gpu_ops gp106_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