From 7ac0b046a538daa1a3532d3d5ae7cba1ef3295ba Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 30 Aug 2018 14:05:16 -0700 Subject: gpu: nvgpu: Move MC HAL to common Move implementation of MC HAL to common/mc. Also bump gk20a implementation to gm20b. gk20a_mc_boot_0 was used via a HAL, but we have only one possible implementation. It also has to be anyway called directly to detect which HALs to assign, so make it a true common function. mc_gk20a_handle_intr_nonstall was also used only in os/linux/intr.c so move it there. JIRA NVGPU-954 Change-Id: I79aedc9158f90d578db0edc17b714617b52690ac Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1813519 Reviewed-by: svc-misra-checker GVS: Gerrit_Virtual_Submit Reviewed-by: Konsta Holtta Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.sources | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/Makefile.sources') diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index ceec9116..a53548f4 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -107,6 +107,11 @@ srcs := os/posix/nvgpu.c \ common/clock_gating/gv100_gating_reglist.c \ common/fifo/channel.c \ common/fifo/submit.c \ + common/mc/mc.c \ + common/mc/mc_gm20b.c \ + common/mc/mc_gp10b.c \ + common/mc/mc_gv11b.c \ + common/mc/mc_gv100.c \ boardobj/boardobj.c \ boardobj/boardobjgrp.c \ boardobj/boardobjgrpmask.c \ @@ -154,7 +159,6 @@ srcs := os/posix/nvgpu.c \ gk20a/gr_ctx_gk20a.c \ gk20a/hal.c \ gk20a/tsg_gk20a.c \ - gk20a/mc_gk20a.c \ gm20b/hal_gm20b.c \ gm20b/gr_gm20b.c \ gm20b/clk_gm20b.c \ @@ -167,7 +171,6 @@ srcs := os/posix/nvgpu.c \ gp10b/gr_gp10b.c \ gp10b/gr_ctx_gp10b.c \ gp10b/ce_gp10b.c \ - gp10b/mc_gp10b.c \ gp10b/fifo_gp10b.c \ gp10b/mm_gp10b.c \ gp10b/pmu_gp10b.c \ @@ -178,7 +181,6 @@ srcs := os/posix/nvgpu.c \ gp10b/ecc_gp10b.c \ gv11b/gv11b.c \ gv11b/dbg_gpu_gv11b.c \ - gv11b/mc_gv11b.c \ gv11b/hal_gv11b.c \ gv11b/gr_gv11b.c \ gv11b/fifo_gv11b.c \ @@ -210,7 +212,6 @@ srcs := os/posix/nvgpu.c \ gv100/gr_gv100.c \ gv100/regops_gv100.c \ gv100/flcn_gv100.c \ - gv100/mc_gv100.c \ gv100/nvlink_gv100.c \ gv100/hal_gv100.c \ gv100/pmu_gv100.c -- cgit v1.2.2