From e62785190f74cfbf9003a190a768e9077373bf6f Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 10 Aug 2018 08:28:23 -0700 Subject: gpu: nvgpu: Move priv_ring HAL to common Move implementation of priv_ring HAL to common/priv_ring. Implement two new HAL APIs to remove illegal dependencies: enable_priv_ring and enum_ltc. As enum_ltc can be implemented only gm20b onwards, bump gk20a implementation to base on gm20b. JIRA NVGPU-964 Change-Id: I160c2216132aadbcd98bb4a688aeeb2c520a9bc0 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1797025 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/Makefile.sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpu/nvgpu/Makefile.sources') diff --git a/drivers/gpu/nvgpu/Makefile.sources b/drivers/gpu/nvgpu/Makefile.sources index 677b20bd..e8e107ae 100644 --- a/drivers/gpu/nvgpu/Makefile.sources +++ b/drivers/gpu/nvgpu/Makefile.sources @@ -36,6 +36,8 @@ srcs := common/mm/nvgpu_allocator.c \ common/bus/bus_gm20b.c \ common/bus/bus_gp10b.c \ common/bus/bus_gv100.c \ + common/priv_ring/priv_ring_gm20b.c \ + common/priv_ring/priv_ring_gp10b.c \ common/fb/fb_gk20a.c \ common/fb/fb_gm20b.c \ common/fb/fb_gp10b.c \ @@ -135,7 +137,6 @@ srcs := common/mm/nvgpu_allocator.c \ gk20a/mm_gk20a.c \ gk20a/pmu_gk20a.c \ gk20a/flcn_gk20a.c \ - gk20a/priv_ring_gk20a.c \ gk20a/fence_gk20a.c \ gk20a/therm_gk20a.c \ gk20a/gr_ctx_gk20a_sim.c \ @@ -167,7 +168,6 @@ srcs := common/mm/nvgpu_allocator.c \ gp10b/regops_gp10b.c \ gp10b/therm_gp10b.c \ gp10b/fecs_trace_gp10b.c \ - gp10b/priv_ring_gp10b.c \ gp10b/gp10b.c \ gp10b/fuse_gp10b.c \ gp10b/ecc_gp10b.c \ -- cgit v1.2.2