diff options
author | Richard Zhao <rizhao@nvidia.com> | 2018-06-20 20:27:02 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-06-21 16:58:07 -0400 |
commit | c3b5b48c0fbecfb874d0fa4aa52286849bb36a5b (patch) | |
tree | 453ae0733cbdf1611a39d04ff50d533fbad31603 /drivers/gpu/nvgpu/gv11b | |
parent | e4e2c1882865163ad53eeaf96acf83802ffbec71 (diff) |
gpu: nvgpu: move slices_per_ltc & cacheline_size init to floorsweeping
It was initialized at .init_comptags, but we may also need them without
comptags.
Jira NVGPUT-63
Change-Id: Ie818c3ecf890fc84323b9662a32d666a6d2b3936
Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1756373
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/ltc_gv11b.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c index 96844ebd..b64faaa6 100644 --- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c | |||
@@ -53,6 +53,7 @@ void gv11b_ltc_set_zbc_stencil_entry(struct gk20a *g, | |||
53 | 53 | ||
54 | void gv11b_ltc_init_fs_state(struct gk20a *g) | 54 | void gv11b_ltc_init_fs_state(struct gk20a *g) |
55 | { | 55 | { |
56 | struct gr_gk20a *gr = &g->gr; | ||
56 | u32 ltc_intr; | 57 | u32 ltc_intr; |
57 | u32 reg; | 58 | u32 reg; |
58 | 59 | ||
@@ -62,6 +63,11 @@ void gv11b_ltc_init_fs_state(struct gk20a *g) | |||
62 | g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r()); | 63 | g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r()); |
63 | nvgpu_log_info(g, "%u ltcs out of %u", g->ltc_count, g->max_ltc_count); | 64 | nvgpu_log_info(g, "%u ltcs out of %u", g->ltc_count, g->max_ltc_count); |
64 | 65 | ||
66 | reg = gk20a_readl(g, ltc_ltcs_ltss_cbc_param_r()); | ||
67 | gr->slices_per_ltc = ltc_ltcs_ltss_cbc_param_slices_per_ltc_v(reg);; | ||
68 | gr->cacheline_size = | ||
69 | 512U << ltc_ltcs_ltss_cbc_param_cache_line_size_v(reg); | ||
70 | |||
65 | /* Disable LTC interrupts */ | 71 | /* Disable LTC interrupts */ |
66 | reg = gk20a_readl(g, ltc_ltcs_ltss_intr_r()); | 72 | reg = gk20a_readl(g, ltc_ltcs_ltss_intr_r()); |
67 | reg &= ~ltc_ltcs_ltss_intr_en_evicted_cb_m(); | 73 | reg &= ~ltc_ltcs_ltss_intr_en_evicted_cb_m(); |