From c616fba1eb357684e3796603a226f4df7d88be73 Mon Sep 17 00:00:00 2001 From: ddutta Date: Mon, 17 Sep 2018 13:09:18 +0530 Subject: gpu: nvgpu: remove circular dependency between hal.c and gk20a/ gk20a/hal.c depends on HAL init functions in all chips. But all chips also depend on gk20a. That creates a circular dependency. In order to solve the above, move gpu_init_hal and gk20a_detect_chip to common/init/hal_init.c. These methods are declared in include/nvgpu/hal_init.h. Also, the above methods are renamed to nvgpu_init_hal and nvgpu_detect_chip respectively. Jira NVGPU-613 Change-Id: Ib0df90287d4491571e4751475739b75fabd1041b Signed-off-by: Debarshi Dutta Reviewed-on: https://git-master.nvidia.com/r/1827576 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/Makefile.sources') diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 5c15ebd0..4e67434d 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -68,6 +68,7 @@ srcs := os/posix/nvgpu.c \ common/fb/fb_gp106.c \ common/fb/fb_gv100.c \ common/fb/fb_gv11b.c \ + common/init/hal_init.c \ common/xve/xve_gp106.c \ common/therm/therm.c \ common/therm/therm_gm20b.c \ @@ -157,7 +158,6 @@ srcs := os/posix/nvgpu.c \ gk20a/fence_gk20a.c \ gk20a/gr_ctx_gk20a_sim.c \ gk20a/gr_ctx_gk20a.c \ - gk20a/hal.c \ gk20a/tsg_gk20a.c \ gm20b/hal_gm20b.c \ gm20b/gr_gm20b.c \ -- cgit v1.2.2