From e13ab1f9eab46b4e22dfdc2fed1a27c9be5d1e31 Mon Sep 17 00:00:00 2001 From: Vedashree Vidwans Date: Mon, 16 Aug 2021 19:43:26 -0700 Subject: [PATCH] gpu: nvgpu: pmu: remove hw access from remove_pmu_support GPU HW registers are locked before remove_pmu_support. Remove functions accessing HW registers. Bug 3357477 Change-Id: I34a1923bfdb3afacd462f2646e2821569573a81a Signed-off-by: Vedashree Vidwans Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2577627 Reviewed-by: svc_kernel_abi Reviewed-by: Seshendra Gadagottu Reviewed-by: Seema Khowala Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: Seshendra Gadagottu Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/falcon/falcon_debug.c | 2 +- drivers/gpu/nvgpu/common/pmu/pmu_rtos_init.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/gpu/nvgpu/common/falcon/falcon_debug.c b/drivers/gpu/nvgpu/common/falcon/falcon_debug.c index fc3f4754c..449461e93 100644 --- a/drivers/gpu/nvgpu/common/falcon/falcon_debug.c +++ b/drivers/gpu/nvgpu/common/falcon/falcon_debug.c @@ -50,7 +50,7 @@ void nvgpu_falcon_dbg_buf_destroy(struct nvgpu_falcon *flcn) debug_buffer->first_msg_received = false; debug_buffer->read_offset = 0; debug_buffer->buffer_size = 0; - debug_buffer->dmem_offset = g->ops.falcon.get_mem_size(flcn, MEM_DMEM); + debug_buffer->dmem_offset = 0; } int nvgpu_falcon_dbg_buf_init(struct nvgpu_falcon *flcn, diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_rtos_init.c b/drivers/gpu/nvgpu/common/pmu/pmu_rtos_init.c index 694294794..3e954503d 100644 --- a/drivers/gpu/nvgpu/common/pmu/pmu_rtos_init.c +++ b/drivers/gpu/nvgpu/common/pmu/pmu_rtos_init.c @@ -162,7 +162,6 @@ static void remove_pmu_support(struct nvgpu_pmu *pmu) #ifdef CONFIG_NVGPU_FALCON_DEBUG if (nvgpu_is_enabled(g, NVGPU_PMU_NEXT_CORE_ENABLED)) { - nvgpu_falcon_dbg_buf_display(pmu->flcn); nvgpu_falcon_dbg_buf_destroy(pmu->flcn); } #endif