From 6486d4b8f1c9750f039374db00477e0af167cfbe Mon Sep 17 00:00:00 2001 From: Sunny He Date: Fri, 11 Aug 2017 14:41:50 -0700 Subject: Revert "gpu: nvgpu: gv11b: Reorg fb HAL initialization" Conflicts with gv100 changes This reverts commit da8e67f042760d54f3d6b5f84abbd9981d9fcd54. Change-Id: Ifd1a51debc0e92fc443e6ac0aad1b224821d6585 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1537669 Reviewed-by: Shu Zhong Tested-by: Shu Zhong --- drivers/gpu/nvgpu/gv11b/fb_gv11b.c | 25 +++++++++++++++++++------ drivers/gpu/nvgpu/gv11b/fb_gv11b.h | 11 ++--------- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 25 +------------------------ 3 files changed, 22 insertions(+), 39 deletions(-) diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c index 384dfb20..35227576 100644 --- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c @@ -75,7 +75,7 @@ static void gv11b_init_nvlink_soc_credits(struct gk20a *g) } -void gv11b_fb_init_fs_state(struct gk20a *g) +static void gv11b_fb_init_fs_state(struct gk20a *g) { nvgpu_log(g, gpu_dbg_fn, "initialize gv11b fb"); @@ -87,7 +87,7 @@ void gv11b_fb_init_fs_state(struct gk20a *g) gk20a_readl(g, fb_mmu_num_active_ltcs_r()))); } -void gv11b_fb_init_cbc(struct gk20a *g, struct gr_gk20a *gr) +static void gv11b_fb_init_cbc(struct gk20a *g, struct gr_gk20a *gr) { u32 max_size = gr->max_comptag_mem; /* one tag line covers 64KB */ @@ -137,7 +137,7 @@ void gv11b_fb_init_cbc(struct gk20a *g, struct gr_gk20a *gr) } -void gv11b_fb_reset(struct gk20a *g) +static void gv11b_fb_reset(struct gk20a *g) { u32 val; @@ -251,7 +251,7 @@ static const char *const gpc_client_descs_gv11b[] = { "t1 36", "t1 37", "t1 38", "t1 39", }; -noinline_for_stack void gv11b_init_uncompressed_kind_map(void) +static noinline_for_stack void gv11b_init_uncompressed_kind_map(void) { int i; @@ -672,7 +672,7 @@ static noinline_for_stack bool gv11b_kind_zbc(u8 k) k <= gmmu_pte_kind_c128_ms8_ms16_2cr_v()); } -void gv11b_init_kind_attr(void) +static void gv11b_init_kind_attr(void) { u16 k; @@ -1815,7 +1815,7 @@ static void gv11b_fb_handle_mmu_fault(struct gk20a *g, u32 niso_intr) fb_mmu_fault_status_valid_clear_f()); } -void gv11b_fb_hub_isr(struct gk20a *g) +static void gv11b_fb_hub_isr(struct gk20a *g) { u32 status, niso_intr; @@ -1967,3 +1967,16 @@ static int gv11b_fb_fix_page_fault(struct gk20a *g, pte[1], pte[0]); return err; } + +void gv11b_init_fb(struct gpu_ops *gops) +{ + gp10b_init_fb(gops); + gops->fb.hub_isr = gv11b_fb_hub_isr; + gops->fb.reset = gv11b_fb_reset; + gops->fb.init_fs_state = gv11b_fb_init_fs_state; + gops->fb.init_cbc = gv11b_fb_init_cbc; + + gv11b_init_uncompressed_kind_map(); + gv11b_init_kind_attr(); + +} diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.h b/drivers/gpu/nvgpu/gv11b/fb_gv11b.h index 3e2dd828..39cdfb77 100644 --- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.h +++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.h @@ -42,13 +42,9 @@ #define FAULT_TYPE_OTHER_AND_NONREPLAY 0 #define FAULT_TYPE_REPLAY 1 -struct gk20a; - -void gv11b_fb_init_fs_state(struct gk20a *g); -void gv11b_fb_init_cbc(struct gk20a *g, struct gr_gk20a *gr); -void gv11b_fb_reset(struct gk20a *g); -void gv11b_fb_hub_isr(struct gk20a *g); +struct gpu_ops; +void gv11b_init_fb(struct gpu_ops *gops); u32 gv11b_fb_is_fault_buf_enabled(struct gk20a *g, unsigned int index); void gv11b_fb_fault_buf_set_state_hw(struct gk20a *g, @@ -60,7 +56,4 @@ void gv11b_fb_disable_hub_intr(struct gk20a *g, unsigned int index, unsigned int intr_type); void gv11b_fb_fault_buf_configure_hw(struct gk20a *g, unsigned int index); bool gv11b_fb_mmu_fault_pending(struct gk20a *g); - -noinline_for_stack void gv11b_init_uncompressed_kind_map(void); -void gv11b_init_kind_attr(void); #endif diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 9f6c67c1..282aa228 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -29,11 +29,9 @@ #include "gk20a/bus_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" -#include "gk20a/fb_gk20a.h" #include "gm20b/ltc_gm20b.h" #include "gm20b/gr_gm20b.h" -#include "gm20b/fb_gm20b.h" #include "gm20b/fifo_gm20b.h" #include "gp10b/ltc_gp10b.h" @@ -43,7 +41,6 @@ #include "gp10b/priv_ring_gp10b.h" #include "gp10b/fifo_gp10b.h" #include "gp10b/fecs_trace_gp10b.h" -#include "gp10b/fb_gp10b.h" #include "hal_gv11b.h" #include "gr_gv11b.h" @@ -178,23 +175,6 @@ static const struct gpu_ops gv11b_ops = { .isr_nonstall = gp10b_ce_nonstall_isr, .get_num_pce = gv11b_ce_get_num_pce, }, - .fb = { - .reset = gv11b_fb_reset, - .init_hw = gk20a_fb_init_hw, - .init_fs_state = gv11b_fb_init_fs_state, - .init_cbc = gv11b_fb_init_cbc, - .set_mmu_page_size = gm20b_fb_set_mmu_page_size, - .set_use_full_comp_tag_line = - gm20b_fb_set_use_full_comp_tag_line, - .compression_page_size = gp10b_fb_compression_page_size, - .compressible_page_size = gp10b_fb_compressible_page_size, - .vpr_info_fetch = gm20b_fb_vpr_info_fetch, - .dump_vpr_wpr_info = gm20b_fb_dump_vpr_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, - .hub_isr = gv11b_fb_hub_isr, - }, .clock_gating = { .slcg_bus_load_gating_prod = gv11b_slcg_bus_load_gating_prod, @@ -425,7 +405,6 @@ int gv11b_init_hal(struct gk20a *g) gops->ltc = gv11b_ops.ltc; gops->ce2 = gv11b_ops.ce2; - gops->fb = gv11b_ops.fb; gops->clock_gating = gv11b_ops.clock_gating; gops->fifo = gv11b_ops.fifo; gops->gr_ctx = gv11b_ops.gr_ctx; @@ -453,12 +432,10 @@ int gv11b_init_hal(struct gk20a *g) __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); gv11b_init_gr(g); + gv11b_init_fb(gops); gv11b_init_mm(gops); gv11b_init_pmu_ops(g); - gv11b_init_uncompressed_kind_map(); - gv11b_init_kind_attr(); - g->name = "gv11b"; c->twod_class = FERMI_TWOD_A; -- cgit v1.2.2