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 <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/926574
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 4 insertions, 4 deletions

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);
         /*