summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/mm/vidmem.c
diff options
context:
space:
mode:
authorAparna Das <aparnad@nvidia.com>2018-07-13 18:46:13 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-07-20 01:15:02 -0400
commit2df33e32e40eb2c8e025f8d27396d9b5cdb3ac11 (patch)
tree900f7ffe6da43c79a64e5bd46d1862dc102265d7 /drivers/gpu/nvgpu/common/mm/vidmem.c
parent3a5fd2399cabc0c268c6a3c518b698be9d08e07b (diff)
gpu: nvgpu: do not access register in vidmem destroy
Do vidmem destroy only if get_vidmem_size HAL op is set which will skip this for iGPU. Do not read vidmem size explicitly in vidmem destroy in shutdown path after prepare poweroff. Bug 200427479 Change-Id: Ic919b03d44b5505646b449fd74f9f5d3e9e0dfee Signed-off-by: Aparna Das <aparnad@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1776388 Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Richard Zhao <rizhao@nvidia.com> Reviewed-by: Alex Waterman <alexw@nvidia.com> Reviewed-by: Nirav Patel <nipatel@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/vidmem.c')
-rw-r--r--drivers/gpu/nvgpu/common/mm/vidmem.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/vidmem.c b/drivers/gpu/nvgpu/common/mm/vidmem.c
index b6e1919f..febf6830 100644
--- a/drivers/gpu/nvgpu/common/mm/vidmem.c
+++ b/drivers/gpu/nvgpu/common/mm/vidmem.c
@@ -39,13 +39,8 @@
39void nvgpu_vidmem_destroy(struct gk20a *g) 39void nvgpu_vidmem_destroy(struct gk20a *g)
40{ 40{
41 struct nvgpu_timeout timeout; 41 struct nvgpu_timeout timeout;
42 size_t size;
43 42
44 size = g->ops.mm.get_vidmem_size ? 43 if (!g->ops.mm.get_vidmem_size)
45 g->ops.mm.get_vidmem_size(g) : 0;
46
47 /* Nothing to destroy if no vidmem */
48 if (!size)
49 return; 44 return;
50 45
51 nvgpu_timeout_init(g, &timeout, 100, NVGPU_TIMER_RETRY_TIMER); 46 nvgpu_timeout_init(g, &timeout, 100, NVGPU_TIMER_RETRY_TIMER);