nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Use gm20b version of BAR1 bind

Browse Source 
All chips should use the waiting version of BAR1 bind since gm20b.
Change gp10b and gp106 to do that. BAR1 is not used in Volta.

JIRa NVGPU-588

Change-Id: Ib6957ebea4effa7c64f4d71522447fa6245728ed
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1730895
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Terje Bergstrom
2018-05-25 08:39:06 -07:00
committed by Tejal Kudav
parent 75b6385490
commit 5c8f1619ce
5 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpu/nvgpu/common/bus/bus_gk20a.c
View File

@@ -59,24 +59,6 @@ void gk20a_bus_isr(struct gk20a *g)
gk20a_writel(g, bus_intr_0_r(), val);
}
int gk20a_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst)
{
u64 iova = nvgpu_inst_block_addr(g, bar1_inst);
u32 ptr_v = (u32)(iova >> bus_bar1_block_ptr_shift_v());
nvgpu_log(g, gpu_dbg_info, "bar1 inst block ptr: 0x%08x", ptr_v);
gk20a_writel(g, bus_bar1_block_r(),
nvgpu_aperture_mask(g, bar1_inst,
bus_bar1_block_target_sys_mem_ncoh_f(),
bus_bar1_block_target_sys_mem_coh_f(),
bus_bar1_block_target_vid_mem_f()) |
bus_bar1_block_mode_virtual_f() |
bus_bar1_block_ptr_f(ptr_v));
return 0;
}
u32 gk20a_bus_set_bar0_window(struct gk20a *g, struct nvgpu_mem *mem,
struct nvgpu_sgt *sgt, struct nvgpu_sgl *sgl, u32 w)
{

1
drivers/gpu/nvgpu/common/bus/bus_gk20a.h
View File

@@ -31,7 +31,6 @@ struct nvgpu_sgl;
void gk20a_bus_isr(struct gk20a *g);
void gk20a_bus_init_hw(struct gk20a *g);
int gk20a_bus_bar1_bind(struct gk20a *g, struct nvgpu_mem *bar1_inst);
u32 gk20a_bus_set_bar0_window(struct gk20a *g, struct nvgpu_mem *mem,
struct nvgpu_sgt *sgt,
struct nvgpu_sgl *sgl,

3
drivers/gpu/nvgpu/gp106/hal_gp106.c
View File

@@ -25,6 +25,7 @@
#include "common/bus/bus_gk20a.h"
#include "common/clock_gating/gp106_gating_reglist.h"
#include "common/ptimer/ptimer_gk20a.h"
#include "common/bus/bus_gm20b.h"
#include "gk20a/gk20a.h"
#include "gk20a/fifo_gk20a.h"
@@ -721,7 +722,7 @@ static const struct gpu_ops gp106_ops = {
.bus = {
.init_hw = gk20a_bus_init_hw,
.isr = gk20a_bus_isr,
.bar1_bind = gk20a_bus_bar1_bind,
.bar1_bind = gm20b_bus_bar1_bind,
.set_bar0_window = gk20a_bus_set_bar0_window,
},
.ptimer = {

3
drivers/gpu/nvgpu/gp10b/hal_gp10b.c
View File

@@ -25,6 +25,7 @@
#include "common/bus/bus_gk20a.h"
#include "common/clock_gating/gp10b_gating_reglist.h"
#include "common/ptimer/ptimer_gk20a.h"
#include "common/bus/bus_gm20b.h"
#include "gk20a/gk20a.h"
#include "gk20a/fifo_gk20a.h"
@@ -651,7 +652,7 @@ static const struct gpu_ops gp10b_ops = {
.bus = {
.init_hw = gk20a_bus_init_hw,
.isr = gk20a_bus_isr,
.bar1_bind = gk20a_bus_bar1_bind,
.bar1_bind = gm20b_bus_bar1_bind,
.set_bar0_window = gk20a_bus_set_bar0_window,
},
.ptimer = {

3
drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c
View File

@@ -21,6 +21,7 @@
*/
#include "common/bus/bus_gk20a.h"
#include "common/bus/bus_gm20b.h"
#include "common/clock_gating/gp10b_gating_reglist.h"
#include "vgpu/fifo_vgpu.h"
@@ -523,7 +524,7 @@ static const struct gpu_ops vgpu_gp10b_ops = {
.bus = {
.init_hw = gk20a_bus_init_hw,
.isr = gk20a_bus_isr,
.bar1_bind = gk20a_bus_bar1_bind,
.bar1_bind = gm20b_bus_bar1_bind,
.set_bar0_window = gk20a_bus_set_bar0_window,
},
.ptimer = {