gpu: nvgpu: Fix some GPU boot error paths

Fix panics in error path when FECS cannot be booted.

Change-Id: I354e37579386e27f46b80cd4172fe12897a3b92f
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/712698

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
index 9ed4febb..f632245e 100644
--- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c
@@ -2235,10 +2235,15 @@ static void gk20a_gr_destroy_ctx_buffer(struct platform_device *pdev,
         struct device *dev = &pdev->dev;
         if (!desc)
                 return;
-        if (desc->sgt)
+        if (desc->sgt) {
                 gk20a_free_sgtable(&desc->sgt);
-        dma_free_attrs(dev, desc->size, desc->pages,
+                desc->sgt = NULL;
+        }
+        if (desc->pages) {
+                dma_free_attrs(dev, desc->size, desc->pages,
                        desc->iova, &desc->attrs);
+                desc->pages = NULL;
+        }
 }
 
 static int gk20a_gr_alloc_ctx_buffer(struct platform_device *pdev,
@@ -4510,7 +4515,7 @@ out:
         else
                 gk20a_dbg_fn("done");
 
-        return 0;
+        return err;
 }
 
 static int gk20a_init_gr_reset_enable_hw(struct gk20a *g)