diff options
author | Allen Yu <alleny@nvidia.com> | 2014-10-28 01:15:13 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:54 -0400 |
commit | 23a182aaa61d120c965f1bce09609cc14d4e14eb (patch) | |
tree | 9258ef394cafb61f810c665c60e5399dbc0ed37d | |
parent | 748475df20bbe6843bdf4fbc02384dc5aa28866e (diff) |
Revert "gpu: nvgpu: Do not wait for FE GO_IDLE"
This reverts commit ba69a53f2f9ec055d7e61a40352bb9e73ba136be
as it's causing regression in boot stress.
Bug 200049711
Change-Id: Iacdba4d1b3739fd60c5a289d30f076f60389e453
Signed-off-by: Allen Yu <alleny@nvidia.com>
Reviewed-on: http://git-master/r/590634
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index d568b1bc..524547e7 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -337,7 +337,8 @@ static int gr_gk20a_wait_fe_idle(struct gk20a *g, unsigned long end_jiffies, | |||
337 | val = gk20a_readl(g, gr_status_r()); | 337 | val = gk20a_readl(g, gr_status_r()); |
338 | 338 | ||
339 | if (!gr_status_fe_method_upper_v(val) && | 339 | if (!gr_status_fe_method_upper_v(val) && |
340 | !gr_status_fe_method_lower_v(val)) { | 340 | !gr_status_fe_method_lower_v(val) && |
341 | !gr_status_fe_gi_v(val)) { | ||
341 | gk20a_dbg_fn("done"); | 342 | gk20a_dbg_fn("done"); |
342 | return 0; | 343 | return 0; |
343 | } | 344 | } |