summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2014-06-12 19:28:15 +0530
committerMandar Padmawar <mpadmawar@nvidia.com>2014-06-18 21:34:06 -0700
commit569fc01ace0ceb16212293cf6cf8dc7bd0e26998 (patch)
treebfe06c6ce9bcbc48538d3321848de6fe4ab93145
parentcc5a55b9c0a83405dddc7d3f9afcb7ee15b9e79c (diff)
gpu: nvgpu: do not idle timed out channels
While suspending the device, do not submit WFI on timed out channels Submitting WFI on timed out channels will cuase submit_wfi() to return error and as result of this, rail gating of device will be prevented Bug 200010416 Change-Id: Ic097bfdae59dbf9e1f2aea5d8d0431b5f1c3721b Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/422743 (cherry picked from commit 9ac601c0035240f6bacc3c42c5cc9e7b85a65456) Reviewed-on: http://git-master/r/424542 Reviewed-by: Mandar Padmawar <mpadmawar@nvidia.com> Tested-by: Mandar Padmawar <mpadmawar@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 25dee02286a9..cecdc667509c 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -1849,7 +1849,7 @@ int gk20a_channel_suspend(struct gk20a *g)
/* idle the engine by submitting WFI on non-KEPLER_C channel */
for (chid = 0; chid < f->num_channels; chid++) {
struct channel_gk20a *c = &f->channel[chid];
- if (c->in_use && c->obj_class != KEPLER_C) {
+ if (c->in_use && c->obj_class != KEPLER_C && !c->has_timedout) {
err = gk20a_channel_submit_wfi(c);
if (err) {
gk20a_err(d, "cannot idle channel %d\n",