diff options
author | Debarshi Dutta <ddutta@nvidia.com> | 2019-11-15 04:29:31 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2020-02-19 13:41:27 -0500 |
commit | e45e7b5cf87eaf94cf22e631c906170890233d8e (patch) | |
tree | 880fc3d736a3b8a0f595f097dd6f94ffbb0de9e9 /drivers/gpu/nvgpu/gk20a | |
parent | 380e6b2c0c5e03f35aed68b836f64c907070e297 (diff) |
gpu: nvgpu: move cg_enable after pmu_init is complete
This patch help resolve the boot time failures happening with
pmu_exterr for porg. cg_enable can race with pmu_init thread,
cg_enable is moved post pmu init thread to avoid the above race.
Bug 200565050
Change-Id: I2192053eff8767847ea012ca20b3607d2f6cd26f
Signed-off-by: Debarshi Dutta <ddutta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2239959
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Sagar Kamble <skamble@nvidia.com>
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 223937c6..4f897b97 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * GK20A Graphics | 2 | * GK20A Graphics |
3 | * | 3 | * |
4 | * Copyright (c) 2011-2019, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2011-2020, NVIDIA CORPORATION. All rights reserved. |
5 | * | 5 | * |
6 | * Permission is hereby granted, free of charge, to any person obtaining a | 6 | * Permission is hereby granted, free of charge, to any person obtaining a |
7 | * copy of this software and associated documentation files (the "Software"), | 7 | * copy of this software and associated documentation files (the "Software"), |
@@ -4692,6 +4692,9 @@ static int gk20a_init_gr_prepare(struct gk20a *g) | |||
4692 | /* Disable elcg until it gets enabled later in the init*/ | 4692 | /* Disable elcg until it gets enabled later in the init*/ |
4693 | nvgpu_cg_elcg_disable_no_wait(g); | 4693 | nvgpu_cg_elcg_disable_no_wait(g); |
4694 | 4694 | ||
4695 | /* Disable blcg until it gets enabled later in the init*/ | ||
4696 | nvgpu_cg_blcg_disable_no_wait(g); | ||
4697 | |||
4695 | /* enable fifo access */ | 4698 | /* enable fifo access */ |
4696 | gk20a_writel(g, gr_gpfifo_ctl_r(), | 4699 | gk20a_writel(g, gr_gpfifo_ctl_r(), |
4697 | gr_gpfifo_ctl_access_enabled_f() | | 4700 | gr_gpfifo_ctl_access_enabled_f() | |
@@ -5012,7 +5015,6 @@ int gk20a_init_gr_support(struct gk20a *g) | |||
5012 | } | 5015 | } |
5013 | } | 5016 | } |
5014 | 5017 | ||
5015 | nvgpu_cg_elcg_enable_no_wait(g); | ||
5016 | /* GR is inialized, signal possible waiters */ | 5018 | /* GR is inialized, signal possible waiters */ |
5017 | g->gr.initialized = true; | 5019 | g->gr.initialized = true; |
5018 | nvgpu_cond_signal(&g->gr.init_wq); | 5020 | nvgpu_cond_signal(&g->gr.init_wq); |
@@ -5159,6 +5161,7 @@ int gk20a_gr_reset(struct gk20a *g) | |||
5159 | 5161 | ||
5160 | nvgpu_cg_init_gr_load_gating_prod(g); | 5162 | nvgpu_cg_init_gr_load_gating_prod(g); |
5161 | nvgpu_cg_elcg_enable_no_wait(g); | 5163 | nvgpu_cg_elcg_enable_no_wait(g); |
5164 | nvgpu_cg_blcg_enable_no_wait(g); | ||
5162 | 5165 | ||
5163 | /* GR is inialized, signal possible waiters */ | 5166 | /* GR is inialized, signal possible waiters */ |
5164 | g->gr.initialized = true; | 5167 | g->gr.initialized = true; |