summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-09-13 17:31:54 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-21 14:22:12 -0400
commit57e8a2417b256921acb07e9b490941c8ec9e0479 (patch)
tree25e7119dd8fbf130d2b5b98e086f4ea135369585 /drivers/gpu/nvgpu/gk20a
parentce5228e09411f9c54e96cfb0f7e9c857fd9b480d (diff)
gpu: nvgpu: Do not disable GRFIFO access when resetting GR
gk20a_init_gr_prepare() is called only when initializing GR from reset. In those cases there is no need to disable GRFIFO access. Remove the corresponding code. It also gets rid of one extra dependency to MC registers. JIRA NVGPU-954 Change-Id: I935e65f236e0f29ab224787d20e017d8c67e69e2 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1822309 Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> Reviewed-by: Seema Khowala <seemaj@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r--drivers/gpu/nvgpu/gk20a/gr_gk20a.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 4a460d02..6c885b59 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -4705,17 +4705,8 @@ static void gr_gk20a_load_gating_prod(struct gk20a *g)
4705 4705
4706static int gk20a_init_gr_prepare(struct gk20a *g) 4706static int gk20a_init_gr_prepare(struct gk20a *g)
4707{ 4707{
4708 u32 gpfifo_ctrl, pmc_en;
4709 u32 err = 0; 4708 u32 err = 0;
4710 4709
4711 /* disable fifo access */
4712 pmc_en = gk20a_readl(g, mc_enable_r());
4713 if (pmc_en & mc_enable_pgraph_enabled_f()) {
4714 gpfifo_ctrl = gk20a_readl(g, gr_gpfifo_ctl_r());
4715 gpfifo_ctrl &= ~gr_gpfifo_ctl_access_enabled_f();
4716 gk20a_writel(g, gr_gpfifo_ctl_r(), gpfifo_ctrl);
4717 }
4718
4719 /* reset gr engine */ 4710 /* reset gr engine */
4720 g->ops.mc.reset(g, mc_enable_pgraph_enabled_f() | 4711 g->ops.mc.reset(g, mc_enable_pgraph_enabled_f() |
4721 mc_enable_blg_enabled_f() | 4712 mc_enable_blg_enabled_f() |