diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-08-16 17:27:35 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-04 19:15:34 -0400 |
commit | a6499fb9ceddd9ea52cf7e67789a64131545295c (patch) | |
tree | 488c9768a74a71112dcfcac459fa3727aee66195 /drivers/gpu/nvgpu/gv11b | |
parent | 2e051a78a513e021ac84a3da77b778c591284983 (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1801422
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index d87975d1..8d3fb86b 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c | |||
@@ -29,7 +29,6 @@ | |||
29 | #include "common/priv_ring/priv_ring_gp10b.h" | 29 | #include "common/priv_ring/priv_ring_gp10b.h" |
30 | #include "common/clock_gating/gv11b_gating_reglist.h" | 30 | #include "common/clock_gating/gv11b_gating_reglist.h" |
31 | #include "common/ptimer/ptimer_gk20a.h" | 31 | #include "common/ptimer/ptimer_gk20a.h" |
32 | #include "common/fb/fb_gk20a.h" | ||
33 | #include "common/fb/fb_gm20b.h" | 32 | #include "common/fb/fb_gm20b.h" |
34 | #include "common/fb/fb_gp10b.h" | 33 | #include "common/fb/fb_gp10b.h" |
35 | #include "common/fb/fb_gv11b.h" | 34 | #include "common/fb/fb_gv11b.h" |
@@ -444,7 +443,7 @@ static const struct gpu_ops gv11b_ops = { | |||
444 | .read_wpr_info = gm20b_fb_read_wpr_info, | 443 | .read_wpr_info = gm20b_fb_read_wpr_info, |
445 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, | 444 | .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, |
446 | .set_debug_mode = gm20b_fb_set_debug_mode, | 445 | .set_debug_mode = gm20b_fb_set_debug_mode, |
447 | .tlb_invalidate = gk20a_fb_tlb_invalidate, | 446 | .tlb_invalidate = gm20b_fb_tlb_invalidate, |
448 | .hub_isr = gv11b_fb_hub_isr, | 447 | .hub_isr = gv11b_fb_hub_isr, |
449 | .handle_replayable_fault = gv11b_fb_handle_replayable_mmu_fault, | 448 | .handle_replayable_fault = gv11b_fb_handle_replayable_mmu_fault, |
450 | .mem_unlock = NULL, | 449 | .mem_unlock = NULL, |