From dbb8792baf2142626728abf909fb201144b9b56a Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 24 May 2018 13:00:14 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1730890 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gp10b') diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 47986f1b..defec775 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c @@ -31,7 +31,6 @@ #include "gk20a/mm_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/css_gr_gk20a.h" -#include "gk20a/pramin_gk20a.h" #include "gk20a/flcn_gk20a.h" #include "gk20a/regops_gk20a.h" #include "gk20a/mc_gk20a.h" @@ -559,8 +558,6 @@ static const struct gpu_ops gp10b_ops = { .get_kind_pitch = gm20b_get_kind_pitch, }, .pramin = { - .enter = gk20a_pramin_enter, - .exit = gk20a_pramin_exit, .data032_r = pram_data032_r, }, .therm = { @@ -656,6 +653,7 @@ static const struct gpu_ops gp10b_ops = { .read_ptimer = gk20a_read_ptimer, .get_timestamps_zipper = nvgpu_get_timestamps_zipper, .bar1_bind = gk20a_bus_bar1_bind, + .set_bar0_window = gk20a_bus_set_bar0_window, }, #if defined(CONFIG_GK20A_CYCLE_STATS) .css = { -- cgit v1.2.2