diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h | 16 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/mm_gp10b.c | 6 |
2 files changed, 19 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h index 00f2ac5e..9e3137e7 100644 --- a/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h +++ b/drivers/gpu/nvgpu/gp10b/hw_gr_gp10b.h | |||
@@ -1414,6 +1414,14 @@ static inline u32 gr_fecs_new_ctx_target_v(u32 r) | |||
1414 | { | 1414 | { |
1415 | return (r >> 28) & 0x3; | 1415 | return (r >> 28) & 0x3; |
1416 | } | 1416 | } |
1417 | static inline u32 gr_fecs_new_ctx_target_vid_mem_f(void) | ||
1418 | { | ||
1419 | return 0x0; | ||
1420 | } | ||
1421 | static inline u32 gr_fecs_new_ctx_target_sys_mem_ncoh_f(void) | ||
1422 | { | ||
1423 | return 0x30000000; | ||
1424 | } | ||
1417 | static inline u32 gr_fecs_new_ctx_valid_s(void) | 1425 | static inline u32 gr_fecs_new_ctx_valid_s(void) |
1418 | { | 1426 | { |
1419 | return 1; | 1427 | return 1; |
@@ -1466,6 +1474,14 @@ static inline u32 gr_fecs_arb_ctx_ptr_target_v(u32 r) | |||
1466 | { | 1474 | { |
1467 | return (r >> 28) & 0x3; | 1475 | return (r >> 28) & 0x3; |
1468 | } | 1476 | } |
1477 | static inline u32 gr_fecs_arb_ctx_ptr_target_vid_mem_f(void) | ||
1478 | { | ||
1479 | return 0x0; | ||
1480 | } | ||
1481 | static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(void) | ||
1482 | { | ||
1483 | return 0x30000000; | ||
1484 | } | ||
1469 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) | 1485 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) |
1470 | { | 1486 | { |
1471 | return 0x00409a10; | 1487 | return 0x00409a10; |
diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c index c9da4c93..048a4662 100644 --- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c | |||
@@ -105,9 +105,9 @@ static int gb10b_init_bar2_mm_hw_setup(struct gk20a *g) | |||
105 | gk20a_dbg_info("bar2 inst block ptr: 0x%08x", (u32)inst_pa); | 105 | gk20a_dbg_info("bar2 inst block ptr: 0x%08x", (u32)inst_pa); |
106 | 106 | ||
107 | gk20a_writel(g, bus_bar2_block_r(), | 107 | gk20a_writel(g, bus_bar2_block_r(), |
108 | (g->mm.vidmem_is_vidmem ? | 108 | gk20a_aperture_mask(g, inst_block, |
109 | bus_bar2_block_target_sys_mem_ncoh_f() : | 109 | bus_bar2_block_target_sys_mem_ncoh_f(), |
110 | bus_bar2_block_target_vid_mem_f()) | | 110 | bus_bar2_block_target_vid_mem_f()) | |
111 | bus_bar2_block_mode_virtual_f() | | 111 | bus_bar2_block_mode_virtual_f() | |
112 | bus_bar2_block_ptr_f(inst_pa)); | 112 | bus_bar2_block_ptr_f(inst_pa)); |
113 | 113 | ||