diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-08-30 17:05:16 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-13 22:18:24 -0400 |
commit | 7ac0b046a538daa1a3532d3d5ae7cba1ef3295ba (patch) | |
tree | 79e42a4abe1e0c7d2918fa588f50061b90ee3e5f /drivers/gpu/nvgpu/Makefile | |
parent | bf14c2a0faf922073eaf72d490bf8bde8df1a5c7 (diff) |
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 <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1813519
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/Makefile')
-rw-r--r-- | drivers/gpu/nvgpu/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile index d7399c5d..d0dd252e 100644 --- a/drivers/gpu/nvgpu/Makefile +++ b/drivers/gpu/nvgpu/Makefile | |||
@@ -45,7 +45,12 @@ nvgpu-y += common/bus/bus_gk20a.o \ | |||
45 | common/fuse/fuse_gm20b.o \ | 45 | common/fuse/fuse_gm20b.o \ |
46 | common/fuse/fuse_gp10b.o \ | 46 | common/fuse/fuse_gp10b.o \ |
47 | common/fuse/fuse_gp106.o \ | 47 | common/fuse/fuse_gp106.o \ |
48 | common/top/top_gv100.o | 48 | common/top/top_gv100.o \ |
49 | common/mc/mc.o \ | ||
50 | common/mc/mc_gm20b.o \ | ||
51 | common/mc/mc_gp10b.o \ | ||
52 | common/mc/mc_gv11b.o \ | ||
53 | common/mc/mc_gv100.o | ||
49 | 54 | ||
50 | # Linux specific parts of nvgpu. | 55 | # Linux specific parts of nvgpu. |
51 | nvgpu-y += \ | 56 | nvgpu-y += \ |
@@ -236,7 +241,6 @@ nvgpu-y += \ | |||
236 | gk20a/hal.o \ | 241 | gk20a/hal.o \ |
237 | gk20a/tsg_gk20a.o \ | 242 | gk20a/tsg_gk20a.o \ |
238 | gk20a/fecs_trace_gk20a.o \ | 243 | gk20a/fecs_trace_gk20a.o \ |
239 | gk20a/mc_gk20a.o \ | ||
240 | gm20b/hal_gm20b.o \ | 244 | gm20b/hal_gm20b.o \ |
241 | gm20b/gr_gm20b.o \ | 245 | gm20b/gr_gm20b.o \ |
242 | gm20b/clk_gm20b.o \ | 246 | gm20b/clk_gm20b.o \ |
@@ -285,7 +289,6 @@ nvgpu-y += \ | |||
285 | gp10b/gr_gp10b.o \ | 289 | gp10b/gr_gp10b.o \ |
286 | gp10b/gr_ctx_gp10b.o \ | 290 | gp10b/gr_ctx_gp10b.o \ |
287 | gp10b/ce_gp10b.o \ | 291 | gp10b/ce_gp10b.o \ |
288 | gp10b/mc_gp10b.o \ | ||
289 | gp10b/fifo_gp10b.o \ | 292 | gp10b/fifo_gp10b.o \ |
290 | gp10b/mm_gp10b.o \ | 293 | gp10b/mm_gp10b.o \ |
291 | gp10b/pmu_gp10b.o \ | 294 | gp10b/pmu_gp10b.o \ |
@@ -308,7 +311,6 @@ nvgpu-y += \ | |||
308 | gv11b/gv11b.o \ | 311 | gv11b/gv11b.o \ |
309 | gv11b/css_gr_gv11b.o \ | 312 | gv11b/css_gr_gv11b.o \ |
310 | gv11b/dbg_gpu_gv11b.o \ | 313 | gv11b/dbg_gpu_gv11b.o \ |
311 | gv11b/mc_gv11b.o \ | ||
312 | gv11b/hal_gv11b.o \ | 314 | gv11b/hal_gv11b.o \ |
313 | gv11b/gr_gv11b.o \ | 315 | gv11b/gr_gv11b.o \ |
314 | gv11b/fifo_gv11b.o \ | 316 | gv11b/fifo_gv11b.o \ |
@@ -327,7 +329,6 @@ nvgpu-y += \ | |||
327 | gv100/gr_gv100.o \ | 329 | gv100/gr_gv100.o \ |
328 | gv100/regops_gv100.o \ | 330 | gv100/regops_gv100.o \ |
329 | gv100/flcn_gv100.o \ | 331 | gv100/flcn_gv100.o \ |
330 | gv100/mc_gv100.o \ | ||
331 | gv100/nvlink_gv100.o \ | 332 | gv100/nvlink_gv100.o \ |
332 | gv100/hal_gv100.o \ | 333 | gv100/hal_gv100.o \ |
333 | gv100/pmu_gv100.o \ | 334 | gv100/pmu_gv100.o \ |