From c72ea9f83e1ec690247524dbe348c376ba074e85 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Mon, 28 Mar 2016 17:07:46 -0700 Subject: 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 Reviewed-on: http://git-master/r/1116679 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gk20a.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'drivers/gpu') 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) void gk20a_reset(struct gk20a *g, u32 units) { gk20a_disable(g, units); - udelay(20); + if (units & mc_enable_ce2_enabled_f()) + udelay(500); + else + udelay(20); gk20a_enable(g, units); } -- cgit v1.2.2