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/vgpu | |
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/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index f4a87a74..2e12b512 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -37,7 +37,6 @@ | |||
37 | #include "vgpu_mm_gp10b.h" | 37 | #include "vgpu_mm_gp10b.h" |
38 | #include "vgpu_fuse_gp10b.h" | 38 | #include "vgpu_fuse_gp10b.h" |
39 | 39 | ||
40 | #include "gk20a/pramin_gk20a.h" | ||
41 | #include "gk20a/flcn_gk20a.h" | 40 | #include "gk20a/flcn_gk20a.h" |
42 | #include "gk20a/mc_gk20a.h" | 41 | #include "gk20a/mc_gk20a.h" |
43 | #include "gk20a/fb_gk20a.h" | 42 | #include "gk20a/fb_gk20a.h" |
@@ -433,8 +432,6 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
433 | .get_kind_pitch = gm20b_get_kind_pitch, | 432 | .get_kind_pitch = gm20b_get_kind_pitch, |
434 | }, | 433 | }, |
435 | .pramin = { | 434 | .pramin = { |
436 | .enter = gk20a_pramin_enter, | ||
437 | .exit = gk20a_pramin_exit, | ||
438 | .data032_r = pram_data032_r, | 435 | .data032_r = pram_data032_r, |
439 | }, | 436 | }, |
440 | .therm = { | 437 | .therm = { |
@@ -529,6 +526,7 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
529 | .read_ptimer = vgpu_read_ptimer, | 526 | .read_ptimer = vgpu_read_ptimer, |
530 | .get_timestamps_zipper = vgpu_get_timestamps_zipper, | 527 | .get_timestamps_zipper = vgpu_get_timestamps_zipper, |
531 | .bar1_bind = gk20a_bus_bar1_bind, | 528 | .bar1_bind = gk20a_bus_bar1_bind, |
529 | .set_bar0_window = gk20a_bus_set_bar0_window, | ||
532 | }, | 530 | }, |
533 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 531 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
534 | .css = { | 532 | .css = { |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index deecc0d8..0b1aa672 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -577,6 +577,7 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
577 | .read_ptimer = vgpu_read_ptimer, | 577 | .read_ptimer = vgpu_read_ptimer, |
578 | .get_timestamps_zipper = vgpu_get_timestamps_zipper, | 578 | .get_timestamps_zipper = vgpu_get_timestamps_zipper, |
579 | .bar1_bind = NULL, | 579 | .bar1_bind = NULL, |
580 | .set_bar0_window = gk20a_bus_set_bar0_window, | ||
580 | }, | 581 | }, |
581 | #if defined(CONFIG_GK20A_CYCLE_STATS) | 582 | #if defined(CONFIG_GK20A_CYCLE_STATS) |
582 | .css = { | 583 | .css = { |