summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106
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/gp106
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/gp106')
-rw-r--r--drivers/gpu/nvgpu/gp106/hal_gp106.c5
1 files changed, 2 insertions, 3 deletions
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 @@
29#include "common/bus/bus_gp10b.h" 29#include "common/bus/bus_gp10b.h"
30#include "common/priv_ring/priv_ring_gm20b.h" 30#include "common/priv_ring/priv_ring_gm20b.h"
31#include "common/priv_ring/priv_ring_gp10b.h" 31#include "common/priv_ring/priv_ring_gp10b.h"
32#include "common/fb/fb_gk20a.h"
33#include "common/fb/fb_gp10b.h" 32#include "common/fb/fb_gp10b.h"
34#include "common/fb/fb_gm20b.h" 33#include "common/fb/fb_gm20b.h"
35#include "common/fb/fb_gp106.h" 34#include "common/fb/fb_gp106.h"
@@ -407,7 +406,7 @@ static const struct gpu_ops gp106_ops = {
407 }, 406 },
408 .fb = { 407 .fb = {
409 .reset = gp106_fb_reset, 408 .reset = gp106_fb_reset,
410 .init_hw = gk20a_fb_init_hw, 409 .init_hw = gm20b_fb_init_hw,
411 .init_fs_state = NULL, 410 .init_fs_state = NULL,
412 .set_mmu_page_size = gm20b_fb_set_mmu_page_size, 411 .set_mmu_page_size = gm20b_fb_set_mmu_page_size,
413 .set_use_full_comp_tag_line = 412 .set_use_full_comp_tag_line =
@@ -424,7 +423,7 @@ static const struct gpu_ops gp106_ops = {
424 .read_wpr_info = gm20b_fb_read_wpr_info, 423 .read_wpr_info = gm20b_fb_read_wpr_info,
425 .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled, 424 .is_debug_mode_enabled = gm20b_fb_debug_mode_enabled,
426 .set_debug_mode = gm20b_fb_set_debug_mode, 425 .set_debug_mode = gm20b_fb_set_debug_mode,
427 .tlb_invalidate = gk20a_fb_tlb_invalidate, 426 .tlb_invalidate = gm20b_fb_tlb_invalidate,
428 .mem_unlock = NULL, 427 .mem_unlock = NULL,
429 }, 428 },
430 .clock_gating = { 429 .clock_gating = {