diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-08-16 18:00:07 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-10 18:23:08 -0400 |
commit | 83efad7adb44647d37d98a57cbb6df48e356917d (patch) | |
tree | eebbe2f831484d2e6ea90d027f0dc16d69f42114 /drivers/gpu/nvgpu/gp106/hal_gp106.c | |
parent | a02e1c1f0b012b743d4c1ba9c853057b4359107e (diff) |
gpu: nvgpu: Move FB size query to FB
Vidmem size query was in mm_xxx.c. It involves reading a register from
FB, so move the query to FB HAL.
JIRA NVGPU-1063
Change-Id: I30dfd2c4fdcdd6c841f85aaab7431d52473759bd
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1801425
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/hal_gp106.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp106/hal_gp106.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index da1a44a9..69a797a6 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -81,7 +81,6 @@ | |||
81 | #include "gp106/bios_gp106.h" | 81 | #include "gp106/bios_gp106.h" |
82 | #include "gp106/fifo_gp106.h" | 82 | #include "gp106/fifo_gp106.h" |
83 | #include "gp106/clk_gp106.h" | 83 | #include "gp106/clk_gp106.h" |
84 | #include "gp106/mm_gp106.h" | ||
85 | #include "gp106/pmu_gp106.h" | 84 | #include "gp106/pmu_gp106.h" |
86 | #include "gp106/gr_ctx_gp106.h" | 85 | #include "gp106/gr_ctx_gp106.h" |
87 | #include "gp106/gr_gp106.h" | 86 | #include "gp106/gr_gp106.h" |
@@ -426,6 +425,7 @@ static const struct gpu_ops gp106_ops = { | |||
426 | .set_debug_mode = gm20b_fb_set_debug_mode, | 425 | .set_debug_mode = gm20b_fb_set_debug_mode, |
427 | .tlb_invalidate = gm20b_fb_tlb_invalidate, | 426 | .tlb_invalidate = gm20b_fb_tlb_invalidate, |
428 | .mem_unlock = NULL, | 427 | .mem_unlock = NULL, |
428 | .get_vidmem_size = gp106_fb_get_vidmem_size, | ||
429 | }, | 429 | }, |
430 | .clock_gating = { | 430 | .clock_gating = { |
431 | .slcg_bus_load_gating_prod = | 431 | .slcg_bus_load_gating_prod = |
@@ -598,7 +598,6 @@ static const struct gpu_ops gp106_ops = { | |||
598 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, | 598 | .mmu_fault_pending = gk20a_fifo_mmu_fault_pending, |
599 | .init_bar2_vm = gp10b_init_bar2_vm, | 599 | .init_bar2_vm = gp10b_init_bar2_vm, |
600 | .remove_bar2_vm = gp10b_remove_bar2_vm, | 600 | .remove_bar2_vm = gp10b_remove_bar2_vm, |
601 | .get_vidmem_size = gp106_mm_get_vidmem_size, | ||
602 | .get_kind_invalid = gm20b_get_kind_invalid, | 601 | .get_kind_invalid = gm20b_get_kind_invalid, |
603 | .get_kind_pitch = gm20b_get_kind_pitch, | 602 | .get_kind_pitch = gm20b_get_kind_pitch, |
604 | }, | 603 | }, |