diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/gr_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index bb76178e..2e1b4664 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -4920,14 +4920,17 @@ int gr_gv11b_create_priv_addr_table(struct gk20a *g, | |||
4920 | u32 offset = 0; | 4920 | u32 offset = 0; |
4921 | 4921 | ||
4922 | if (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_GPCGS_GPCTPCA) { | 4922 | if (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_GPCGS_GPCTPCA) { |
4923 | pmm_domain_start = NV_PERF_PMMGPCTPCA_DOMAIN_START; | 4923 | pmm_domain_start = nvgpu_get_litter_value(g, |
4924 | num_domains = NV_PERF_PMMGPC_NUM_DOMAINS; | 4924 | GPU_LIT_PERFMON_PMMGPCTPCA_DOMAIN_START); |
4925 | num_domains = nvgpu_get_litter_value(g, | ||
4926 | GPU_LIT_PERFMON_PMMGPCTPC_DOMAIN_COUNT); | ||
4925 | offset = PRI_PMMGS_OFFSET_MASK(addr); | 4927 | offset = PRI_PMMGS_OFFSET_MASK(addr); |
4926 | } else if (broadcast_flags & | 4928 | } else if (broadcast_flags & |
4927 | PRI_BROADCAST_FLAGS_PMM_GPCGS_GPCTPCB) { | 4929 | PRI_BROADCAST_FLAGS_PMM_GPCGS_GPCTPCB) { |
4928 | pmm_domain_start = NV_PERF_PMMGPCTPCA_DOMAIN_START + | 4930 | pmm_domain_start = nvgpu_get_litter_value(g, |
4929 | NV_PERF_PMMGPC_NUM_DOMAINS; | 4931 | GPU_LIT_PERFMON_PMMGPCTPCB_DOMAIN_START); |
4930 | num_domains = NV_PERF_PMMGPC_NUM_DOMAINS; | 4932 | num_domains = nvgpu_get_litter_value(g, |
4933 | GPU_LIT_PERFMON_PMMGPCTPC_DOMAIN_COUNT); | ||
4931 | offset = PRI_PMMGS_OFFSET_MASK(addr); | 4934 | offset = PRI_PMMGS_OFFSET_MASK(addr); |
4932 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_GPCS) { | 4935 | } else if (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_GPCS) { |
4933 | pmm_domain_start = (addr - | 4936 | pmm_domain_start = (addr - |
@@ -4969,15 +4972,15 @@ int gr_gv11b_create_priv_addr_table(struct gk20a *g, | |||
4969 | gr_gv11b_split_pmm_fbp_broadcast_address(g, | 4972 | gr_gv11b_split_pmm_fbp_broadcast_address(g, |
4970 | PRI_PMMGS_OFFSET_MASK(addr), | 4973 | PRI_PMMGS_OFFSET_MASK(addr), |
4971 | priv_addr_table, &t, | 4974 | priv_addr_table, &t, |
4972 | NV_PERF_PMMFBP_LTC_DOMAIN_START, | 4975 | nvgpu_get_litter_value(g, GPU_LIT_PERFMON_PMMFBP_LTC_DOMAIN_START), |
4973 | NV_PERF_PMMFBP_LTC_NUM_DOMAINS); | 4976 | nvgpu_get_litter_value(g, GPU_LIT_PERFMON_PMMFBP_LTC_DOMAIN_COUNT)); |
4974 | } else if ((addr_type == CTXSW_ADDR_TYPE_ROP) && | 4977 | } else if ((addr_type == CTXSW_ADDR_TYPE_ROP) && |
4975 | (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_FBPGS_ROP)) { | 4978 | (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_FBPGS_ROP)) { |
4976 | gr_gv11b_split_pmm_fbp_broadcast_address(g, | 4979 | gr_gv11b_split_pmm_fbp_broadcast_address(g, |
4977 | PRI_PMMGS_OFFSET_MASK(addr), | 4980 | PRI_PMMGS_OFFSET_MASK(addr), |
4978 | priv_addr_table, &t, | 4981 | priv_addr_table, &t, |
4979 | NV_PERF_PMMFBP_ROP_DOMAIN_START, | 4982 | nvgpu_get_litter_value(g, GPU_LIT_PERFMON_PMMFBP_ROP_DOMAIN_START), |
4980 | NV_PERF_PMMFBP_ROP_NUM_DOMAINS); | 4983 | nvgpu_get_litter_value(g, GPU_LIT_PERFMON_PMMFBP_ROP_DOMAIN_COUNT)); |
4981 | } else if ((addr_type == CTXSW_ADDR_TYPE_FBP) && | 4984 | } else if ((addr_type == CTXSW_ADDR_TYPE_FBP) && |
4982 | (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_FBPS)) { | 4985 | (broadcast_flags & PRI_BROADCAST_FLAGS_PMM_FBPS)) { |
4983 | u32 domain_start; | 4986 | u32 domain_start; |