summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-08-16 17:27:35 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-04 19:15:34 -0400
commita6499fb9ceddd9ea52cf7e67789a64131545295c (patch)
tree488c9768a74a71112dcfcac459fa3727aee66195 /drivers/gpu/nvgpu/gm20b
parent2e051a78a513e021ac84a3da77b778c591284983 (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/gm20b')
-rw-r--r--drivers/gpu/nvgpu/gm20b/hal_gm20b.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 3b80ede0..51ddb561 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -27,7 +27,6 @@
27#include "common/bus/bus_gk20a.h" 27#include "common/bus/bus_gk20a.h"
28#include "common/priv_ring/priv_ring_gm20b.h" 28#include "common/priv_ring/priv_ring_gm20b.h"
29#include "common/ptimer/ptimer_gk20a.h" 29#include "common/ptimer/ptimer_gk20a.h"
30#include "common/fb/fb_gk20a.h"
31#include "common/fb/fb_gm20b.h" 30#include "common/fb/fb_gm20b.h"
32#include "common/therm/therm_gm20b.h" 31#include "common/therm/therm_gm20b.h"
33#include "common/therm/therm_gm20b.h" 32#include "common/therm/therm_gm20b.h"
@@ -332,8 +331,8 @@ static const struct gpu_ops gm20b_ops = {
332 .set_debug_mode = gm20b_gr_set_debug_mode, 331 .set_debug_mode = gm20b_gr_set_debug_mode,
333 }, 332 },
334 .fb = { 333 .fb = {
335 .reset = fb_gk20a_reset, 334 .reset = gm20b_fb_reset,
336 .init_hw = gk20a_fb_init_hw, 335 .init_hw = gm20b_fb_init_hw,
337 .init_fs_state = fb_gm20b_init_fs_state, 336 .init_fs_state = fb_gm20b_init_fs_state,
338 .set_mmu_page_size = gm20b_fb_set_mmu_page_size, 337 .set_mmu_page_size = gm20b_fb_set_mmu_page_size,
339 .set_use_full_comp_tag_line = 338 .set_use_full_comp_tag_line =
@@ -350,7 +349,7 @@ static const struct gpu_ops gm20b_ops = {
350 .read_wpr_info = gm20b_fb_read_wpr_info, 349 .read_wpr_info = gm20b_fb_read_wpr_info,
351 .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, 350 .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled,
352 .set_debug_mode = gm20b_fb_set_debug_mode, 351 .set_debug_mode = gm20b_fb_set_debug_mode,
353 .tlb_invalidate = gk20a_fb_tlb_invalidate, 352 .tlb_invalidate = gm20b_fb_tlb_invalidate,
354 .mem_unlock = NULL, 353 .mem_unlock = NULL,
355 }, 354 },
356 .clock_gating = { 355 .clock_gating = {