diff options
author | Deepak Nibade <dnibade@nvidia.com> | 2018-04-13 03:48:28 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-04-16 01:53:29 -0400 |
commit | a0dfb2b91112a766fb4b3e2aaafa99167151c3da (patch) | |
tree | 03c40e6c819227860204ccd8ec8b629727ac315c /drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |
parent | b64dfdcf9edfd50a8e10aed8a8c96f85c25d59d9 (diff) |
gpu: nvgpu: gv100: consider floorswept FBPA for getting unicast list
In gr_gv11b/gk20a_create_priv_addr_table() we do not consider floorswept FBPAs
and just calculate the unicast list assuming all FBPAs are present
This generates incorrect list of unicast addresses
Fix this introducing new HAL ops.gr.split_fbpa_broadcast_addr
Set gr_gv100_get_active_fpba_mask() for GV100
Set gr_gk20a_split_fbpa_broadcast_addr() for rest of the chips
gr_gv100_get_active_fpba_mask() will first get active FPBA mask and generate
unicast list only for active FBPAs
Bug 200398811
Jira NVGPU-556
Change-Id: Idd11d6e7ad7b6836525fe41509aeccf52038321f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1694444
GVS: Gerrit_Virtual_Submit
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/gr_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index dfb14db7..24366911 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -4557,7 +4557,6 @@ int gr_gv11b_create_priv_addr_table(struct gk20a *g, | |||
4557 | u32 broadcast_flags; | 4557 | u32 broadcast_flags; |
4558 | u32 t; | 4558 | u32 t; |
4559 | int err; | 4559 | int err; |
4560 | int fbpa_num; | ||
4561 | 4560 | ||
4562 | t = 0; | 4561 | t = 0; |
4563 | *num_registers = 0; | 4562 | *num_registers = 0; |
@@ -4671,11 +4670,9 @@ int gr_gv11b_create_priv_addr_table(struct gk20a *g, | |||
4671 | g->ops.gr.split_ltc_broadcast_addr(g, addr, | 4670 | g->ops.gr.split_ltc_broadcast_addr(g, addr, |
4672 | priv_addr_table, &t); | 4671 | priv_addr_table, &t); |
4673 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_FBPA) { | 4672 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_FBPA) { |
4674 | for (fbpa_num = 0; | 4673 | g->ops.gr.split_fbpa_broadcast_addr(g, addr, |
4675 | fbpa_num < nvgpu_get_litter_value(g, GPU_LIT_NUM_FBPAS); | 4674 | nvgpu_get_litter_value(g, GPU_LIT_NUM_FBPAS), |
4676 | fbpa_num++) | 4675 | priv_addr_table, &t); |
4677 | priv_addr_table[t++] = pri_fbpa_addr(g, | ||
4678 | pri_fbpa_addr_mask(g, addr), fbpa_num); | ||
4679 | } else if ((addr_type == CTXSW_ADDR_TYPE_LTCS) && | 4676 | } else if ((addr_type == CTXSW_ADDR_TYPE_LTCS) && |
4680 | (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_FBPGS_LTC)) { | 4677 | (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_FBPGS_LTC)) { |
4681 | gr_gv11b_split_pmm_fbp_broadcast_address(g, | 4678 | gr_gv11b_split_pmm_fbp_broadcast_address(g, |