diff options
author | Alex Waterman <alexw@nvidia.com> | 2016-09-22 13:07:53 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2016-10-26 14:09:57 -0400 |
commit | 93eea1d72934b28db4707e5aa7ab4dab65d89551 (patch) | |
tree | dce26388540b15745ff57ee28c22d058f3602d27 /drivers/gpu/nvgpu/gk20a/gk20a.c | |
parent | f0fe1c2f0247cc4e2d786e879cb0c951ccb2181e (diff) |
gpu: nvgpu: Move CE cleanup
Move the CE cleanup to before the FIFO cleanup. Since the CE closes
a channel during its cleanup the FIFO needs to be initialized since
the FIFO code maintains the vmalloc()'ed channels.
Bug 1816516
Change-Id: Ia7a97059a12a0c2b52368ffe411e597f803e8e6e
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1225613
(cherry picked from commit 707bd2a6d4672c6a7b7a8b2e581ea3a606ed971d)
Reviewed-on: http://git-master/r/1240106
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 70eb0a7e..606dbc1f 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -696,6 +696,9 @@ void gk20a_remove_support(struct device *dev) | |||
696 | if (g->gr.remove_support) | 696 | if (g->gr.remove_support) |
697 | g->gr.remove_support(&g->gr); | 697 | g->gr.remove_support(&g->gr); |
698 | 698 | ||
699 | if (g->mm.remove_ce_support) | ||
700 | g->mm.remove_ce_support(&g->mm); | ||
701 | |||
699 | if (g->fifo.remove_support) | 702 | if (g->fifo.remove_support) |
700 | g->fifo.remove_support(&g->fifo); | 703 | g->fifo.remove_support(&g->fifo); |
701 | 704 | ||