From 2df33e32e40eb2c8e025f8d27396d9b5cdb3ac11 Mon Sep 17 00:00:00 2001 From: Aparna Das Date: Fri, 13 Jul 2018 15:46:13 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1776388 Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: Richard Zhao Reviewed-by: Alex Waterman Reviewed-by: Nirav Patel Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/mm/vidmem.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/common/mm') 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 @@ void nvgpu_vidmem_destroy(struct gk20a *g) { struct nvgpu_timeout timeout; - size_t size; - size = g->ops.mm.get_vidmem_size ? - g->ops.mm.get_vidmem_size(g) : 0; - - /* Nothing to destroy if no vidmem */ - if (!size) + if (!g->ops.mm.get_vidmem_size) return; nvgpu_timeout_init(g, &timeout, 100, NVGPU_TIMER_RETRY_TIMER); -- cgit v1.2.2