diff options
author | Seshendra Gadagottu <sgadagottu@nvidia.com> | 2016-03-28 20:07:46 -0400 |
---|---|---|
committer | Terje Bergstrom <tbergstrom@nvidia.com> | 2016-03-29 14:23:21 -0400 |
commit | c72ea9f83e1ec690247524dbe348c376ba074e85 (patch) | |
tree | d4e05b019391933bb347d2789de31ffb128adae4 /drivers/gpu/nvgpu | |
parent | f5ce107f195a8b35581ff2fd3550214d0fbecc3b (diff) |
gpu: nvgpu: wait for 500 usec before ce reset
Wait for 500 usec before ce reset to ensure that
no memory outstanding requests are pending.
Bug 1699365
Change-Id: I9f73f87cbbdca0208e95ebaee32dd1f764a3cd4f
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/1116679
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index a382ccd1..8eb02db8 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -1805,7 +1805,10 @@ void gk20a_enable(struct gk20a *g, u32 units) | |||
1805 | void gk20a_reset(struct gk20a *g, u32 units) | 1805 | void gk20a_reset(struct gk20a *g, u32 units) |
1806 | { | 1806 | { |
1807 | gk20a_disable(g, units); | 1807 | gk20a_disable(g, units); |
1808 | udelay(20); | 1808 | if (units & mc_enable_ce2_enabled_f()) |
1809 | udelay(500); | ||
1810 | else | ||
1811 | udelay(20); | ||
1809 | gk20a_enable(g, units); | 1812 | gk20a_enable(g, units); |
1810 | } | 1813 | } |
1811 | 1814 | ||