From 53622e893133211a3b8212c3c59eb52b08e141b1 Mon Sep 17 00:00:00 2001 From: Arto Merilainen Date: Tue, 15 Apr 2014 10:58:59 +0300 Subject: gpu: nvgpu: Power on platform deps for wfi Currently gk20a_channel_idle() drops pm_runtime references to gk20a and then drops platform dependencies. As we usually delay powering down gk20a, we may end up to case where the platform dependencies are turned off at the moment we start powering down gk20a. Power off sequence may use platform dependencies for informing completion of the last work, wait-for-idle, and therefore we may simply drop the information about job completion. This patch adds missing calls to power up platform dependencies for the time we submit the last work. Bug 1484824 Change-Id: I058febc717a1cb1cf96964ce20fb807bc876be6c Signed-off-by: Arto Merilainen Reviewed-on: http://git-master/r/396286 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Deepak Nibade Tested-by: Deepak Nibade Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/gpu/nvgpu/gk20a') diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index 4cce7260..f90bc1a3 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c @@ -1840,6 +1840,7 @@ int gk20a_channel_suspend(struct gk20a *g) for (chid = 0; chid < f->num_channels; chid++) { struct channel_gk20a *c = &f->channel[chid]; if (c->in_use && c->obj_class != KEPLER_C) { + gk20a_platform_channel_busy(g->dev); err = gk20a_channel_submit_wfi(c); if (err) { gk20a_err(d, "cannot idle channel %d\n", @@ -1849,6 +1850,7 @@ int gk20a_channel_suspend(struct gk20a *g) c->sync->wait_cpu(c->sync, &c->last_submit_fence, 500000); + gk20a_platform_channel_idle(g->dev); break; } } -- cgit v1.2.2