From 74639b444251d7adc222400625eb59a3d53d0c0a Mon Sep 17 00:00:00 2001 From: Debarshi Dutta Date: Wed, 22 Aug 2018 09:57:01 +0530 Subject: gpu: nvgpu: invoke calls to methods in pmu_gk20a.h via HAL In nvgpu repository, we have multiple accesses to methods in pmu_gk20a.h which have register accesses. Instead of directly invoking these methods, these are now called via HALs. Some common methods such as pmu_wait_message_cond which donot have any register accesses are moved to pmu_ipc.c and the method declarations are moved to pmu.h. Also, changed gm20b_pmu_dbg to nvgpu_dbg_pmu all across the code base. This would remove all indirect dependencies via gk20a.h into pmu_gk20a.h. As a result pmu_gk20a.h is now removed from gk20a.h JIRA-597 Change-Id: Id54b2684ca39362fda7626238c3116cd49e92080 Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/1804283 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'drivers/gpu/nvgpu/vgpu/gp10b') diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 070339d2..3aa9b092 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c @@ -52,6 +52,7 @@ #include "gk20a/flcn_gk20a.h" #include "gk20a/mc_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" +#include "gk20a/pmu_gk20a.h" #include "gp10b/mc_gp10b.h" #include "gp10b/mm_gp10b.h" @@ -430,6 +431,15 @@ static const struct gpu_ops vgpu_gp10b_ops = { .pmu_mutex_size = NULL, .pmu_mutex_acquire = NULL, .pmu_mutex_release = NULL, + .pmu_is_interrupted = NULL, + .pmu_isr = NULL, + .pmu_init_perfmon_counter = NULL, + .pmu_pg_idle_counter_config = NULL, + .pmu_read_idle_counter = NULL, + .pmu_reset_idle_counter = NULL, + .pmu_dump_elpg_stats = NULL, + .pmu_dump_falcon_stats = NULL, + .pmu_enable_irq = NULL, .write_dmatrfbase = NULL, .pmu_elpg_statistics = NULL, .pmu_init_perfmon = NULL, -- cgit v1.2.2