From 3a68fb2d7896170938af9a5bd7efd998f05eda29 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Wed, 23 Dec 2015 15:36:38 -0800 Subject: gpu: nvgpu: suspend cde cleanly Few times cde is getting deadlocked because of pending cde operation. So do the things cleanly, first suspend cde then do channel suspend. Bug 1709757 Change-Id: Iaf566b63d9efb13aa2691c19e2df676c70f26afc Signed-off-by: Seshendra Gadagottu Reviewed-on: http://git-master/r/926574 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/gk20a.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 1f58b510..0982ecdf 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c @@ -1,7 +1,7 @@ /* * GK20A Graphics * - * Copyright (c) 2011-2015, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2011-2016, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -694,13 +694,13 @@ static int gk20a_pm_prepare_poweroff(struct device *dev) if (!g->power_on) return 0; + /* cancel any pending cde work */ + gk20a_cde_suspend(g); + ret = gk20a_channel_suspend(g); if (ret) return ret; - /* cancel any pending cde work */ - gk20a_cde_suspend(g); - /* disable elpg before gr or fifo suspend */ ret |= gk20a_pmu_destroy(g); /* -- cgit v1.2.2