diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-05-24 16:00:14 -0400 |
---|---|---|
committer | Tejal Kudav <tkudav@nvidia.com> | 2018-06-14 09:44:07 -0400 |
commit | dbb8792baf2142626728abf909fb201144b9b56a (patch) | |
tree | 6ca5edfeb3f757bef86aaf6d6ebbf12b2c2aa748 /drivers/gpu/nvgpu/gp106 | |
parent | ed65f1f26e2d0ca4a491215297b61d25b0c1493b (diff) |
gpu: nvgpu: Move setting of BAR0_WINDOW to bus
Move setting of BAR0_WINDOW to bus HAL. Also moves the usage of spinlock to
common code so that pramin_gk20a.[ch] can be deleted.
JIRA NVGPU-588
Change-Id: I3ceabc56016711b2c93f31fedf07daa778a4873a
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1730890
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.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c index 6749dba7..1a9c6a74 100644 --- a/drivers/gpu/nvgpu/gp106/hal_gp106.c +++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include "gk20a/mm_gk20a.h" | 31 | #include "gk20a/mm_gk20a.h" |
32 | #include "gk20a/dbg_gpu_gk20a.h" | 32 | #include "gk20a/dbg_gpu_gk20a.h" |
33 | #include "gk20a/css_gr_gk20a.h" | 33 | #include "gk20a/css_gr_gk20a.h" |
34 | #include "gk20a/pramin_gk20a.h" | ||
35 | #include "gk20a/flcn_gk20a.h" | 34 | #include "gk20a/flcn_gk20a.h" |
36 | #include "gk20a/regops_gk20a.h" | 35 | #include "gk20a/regops_gk20a.h" |
37 | #include "gk20a/mc_gk20a.h" | 36 | #include "gk20a/mc_gk20a.h" |
@@ -589,8 +588,6 @@ static const struct gpu_ops gp106_ops = { | |||
589 | .get_kind_pitch = gm20b_get_kind_pitch, | 588 | .get_kind_pitch = gm20b_get_kind_pitch, |
590 | }, | 589 | }, |
591 | .pramin = { | 590 | .pramin = { |
592 | .enter = gk20a_pramin_enter, | ||
593 | .exit = gk20a_pramin_exit, | ||
594 | .data032_r = pram_data032_r, | 591 | .data032_r = pram_data032_r, |
595 | }, | 592 | }, |
596 | .therm = { | 593 | .therm = { |
@@ -726,7 +723,7 @@ static const struct gpu_ops gp106_ops = { | |||
726 | .read_ptimer = gk20a_read_ptimer, | 723 | .read_ptimer = gk20a_read_ptimer, |
727 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, | 724 | .get_timestamps_zipper = nvgpu_get_timestamps_zipper, |
728 | .bar1_bind = gk20a_bus_bar1_bind, | 725 | .bar1_bind = gk20a_bus_bar1_bind, |
729 | 726 | .set_bar0_window = gk20a_bus_set_bar0_window, | |
730 | }, | 727 | }, |
731 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 728 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
732 | .css = { | 729 | .css = { |