diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2017-02-08 08:21:58 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-03-16 12:17:22 -0400 |
commit | 7fd72e313501c5fca0a161ed768247434233e60c (patch) | |
tree | e17602bca4e3e7757b3b7cf87857559ba6d6514c /drivers/gpu/nvgpu | |
parent | dd0f3a061b565974727f8790e9552aa20565cbf7 (diff) |
gpu: nvgpu: cancel vidmem worker only if supported
Cancel the vidmem.clear_mem_worker during suspend only if vidmem is
enabled via kernel config. Otherwise it's not initialized.
Bug 1853519
Change-Id: If88c756ae14f348eddda01218fa218480217388c
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1321118
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: David Martinez Nieto <dmartineznie@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index a66bf80e..dd62ab42 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -5412,7 +5412,9 @@ int gk20a_mm_suspend(struct gk20a *g) | |||
5412 | { | 5412 | { |
5413 | gk20a_dbg_fn(""); | 5413 | gk20a_dbg_fn(""); |
5414 | 5414 | ||
5415 | #if defined(CONFIG_GK20A_VIDMEM) | ||
5415 | cancel_work_sync(&g->mm.vidmem.clear_mem_worker); | 5416 | cancel_work_sync(&g->mm.vidmem.clear_mem_worker); |
5417 | #endif | ||
5416 | 5418 | ||
5417 | g->ops.mm.cbc_clean(g); | 5419 | g->ops.mm.cbc_clean(g); |
5418 | g->ops.mm.l2_flush(g, false); | 5420 | g->ops.mm.l2_flush(g, false); |