summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2018-06-15 19:40:16 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-06-18 18:45:15 -0400
commit13ec687ae9c8c38279cb1a9226dbb3f64a7ec5b1 (patch)
tree574de23b5d1499b9fdc6d9e0d7365d2bb37a3eae /drivers
parent2573841d89d54301ef4958cde40ed669bb0f9758 (diff)
gpu: nvgpu: remove PMC_ENABLE and PMC_ELPG_ENABLE accesses
We don't need to enable l2/fb/hub/xbar from PMC_ENABLE or PMC_ELPG_ENABLE explicitly from nvgpu Remove the redundant code which accesses those registers Jira NVGPUT-51 Change-Id: I423d3bfc2f63460fc168815b5b5104962e3e72ef Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1751445 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gv11b/fb_gv11b.c14
-rw-r--r--drivers/gpu/nvgpu/gv11b/ltc_gv11b.c7
2 files changed, 0 insertions, 21 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
index bba7e66c..54f0d2d8 100644
--- a/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/fb_gv11b.c
@@ -126,20 +126,6 @@ void gv11b_fb_init_cbc(struct gk20a *g, struct gr_gk20a *gr)
126 126
127void gv11b_fb_reset(struct gk20a *g) 127void gv11b_fb_reset(struct gk20a *g)
128{ 128{
129 if (nvgpu_is_bpmp_running(g) && (!nvgpu_platform_is_simulation(g))) {
130 nvgpu_log(g, gpu_dbg_info, "mc_elpg_enable set by bpmp");
131 } else {
132 u32 mc_elpg_enable_val;
133
134 nvgpu_log(g, gpu_dbg_info, "enable xbar, pfb and hub");
135 mc_elpg_enable_val = mc_elpg_enable_xbar_enabled_f() |
136 mc_elpg_enable_pfb_enabled_f() |
137 mc_elpg_enable_hub_enabled_f();
138 mc_elpg_enable_val |= gk20a_readl(g, mc_elpg_enable_r());
139 gk20a_writel(g, mc_elpg_enable_r(), mc_elpg_enable_val);
140
141 }
142 /* fs hub should be out of reset by now */
143 gv11b_init_nvlink_soc_credits(g); 129 gv11b_init_nvlink_soc_credits(g);
144} 130}
145 131
diff --git a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
index 9f9ff337..96844ebd 100644
--- a/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/ltc_gv11b.c
@@ -58,13 +58,6 @@ void gv11b_ltc_init_fs_state(struct gk20a *g)
58 58
59 nvgpu_log_info(g, "initialize gv11b l2"); 59 nvgpu_log_info(g, "initialize gv11b l2");
60 60
61 g->ops.mc.reset(g, mc_enable_pfb_enabled_f() |
62 mc_enable_l2_enabled_f());
63
64 reg = gk20a_readl(g, mc_elpg_enable_r());
65 reg |= mc_elpg_enable_l2_enabled_f();
66 gk20a_writel(g, mc_elpg_enable_r(), reg);
67
68 g->max_ltc_count = gk20a_readl(g, top_num_ltcs_r()); 61 g->max_ltc_count = gk20a_readl(g, top_num_ltcs_r());
69 g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r()); 62 g->ltc_count = gk20a_readl(g, pri_ringmaster_enum_ltc_r());
70 nvgpu_log_info(g, "%u ltcs out of %u", g->ltc_count, g->max_ltc_count); 63 nvgpu_log_info(g, "%u ltcs out of %u", g->ltc_count, g->max_ltc_count);