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/vgpu | |
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/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 3 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 58f595f4..a90d2d94 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -49,11 +49,9 @@ | |||
49 | #include "vgpu_fuse_gp10b.h" | 49 | #include "vgpu_fuse_gp10b.h" |
50 | 50 | ||
51 | #include "gk20a/flcn_gk20a.h" | 51 | #include "gk20a/flcn_gk20a.h" |
52 | #include "gk20a/mc_gk20a.h" | ||
53 | #include "gk20a/dbg_gpu_gk20a.h" | 52 | #include "gk20a/dbg_gpu_gk20a.h" |
54 | #include "gk20a/pmu_gk20a.h" | 53 | #include "gk20a/pmu_gk20a.h" |
55 | 54 | ||
56 | #include "gp10b/mc_gp10b.h" | ||
57 | #include "gp10b/mm_gp10b.h" | 55 | #include "gp10b/mm_gp10b.h" |
58 | #include "gp10b/ce_gp10b.h" | 56 | #include "gp10b/ce_gp10b.h" |
59 | #include "gp10b/pmu_gp10b.h" | 57 | #include "gp10b/pmu_gp10b.h" |
@@ -484,7 +482,6 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
484 | .enable = NULL, | 482 | .enable = NULL, |
485 | .disable = NULL, | 483 | .disable = NULL, |
486 | .reset = NULL, | 484 | .reset = NULL, |
487 | .boot_0 = NULL, | ||
488 | .is_intr1_pending = NULL, | 485 | .is_intr1_pending = NULL, |
489 | .log_pending_intrs = NULL, | 486 | .log_pending_intrs = NULL, |
490 | }, | 487 | }, |
diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c index 9832a714..3a917bf3 100644 --- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c +++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | |||
@@ -54,7 +54,6 @@ | |||
54 | #include "vgpu/gp10b/vgpu_gr_gp10b.h" | 54 | #include "vgpu/gp10b/vgpu_gr_gp10b.h" |
55 | 55 | ||
56 | #include <gk20a/flcn_gk20a.h> | 56 | #include <gk20a/flcn_gk20a.h> |
57 | #include <gk20a/mc_gk20a.h> | ||
58 | #include "gk20a/dbg_gpu_gk20a.h" | 57 | #include "gk20a/dbg_gpu_gk20a.h" |
59 | #include <gk20a/pmu_gk20a.h> | 58 | #include <gk20a/pmu_gk20a.h> |
60 | 59 | ||
@@ -66,7 +65,6 @@ | |||
66 | 65 | ||
67 | #include <gp10b/pmu_gp10b.h> | 66 | #include <gp10b/pmu_gp10b.h> |
68 | #include <gp10b/mm_gp10b.h> | 67 | #include <gp10b/mm_gp10b.h> |
69 | #include <gp10b/mc_gp10b.h> | ||
70 | #include <gp10b/ce_gp10b.h> | 68 | #include <gp10b/ce_gp10b.h> |
71 | #include "gp10b/gr_gp10b.h" | 69 | #include "gp10b/gr_gp10b.h" |
72 | #include <gp10b/fifo_gp10b.h> | 70 | #include <gp10b/fifo_gp10b.h> |
@@ -77,7 +75,6 @@ | |||
77 | #include <gv11b/pmu_gv11b.h> | 75 | #include <gv11b/pmu_gv11b.h> |
78 | #include <gv11b/acr_gv11b.h> | 76 | #include <gv11b/acr_gv11b.h> |
79 | #include <gv11b/mm_gv11b.h> | 77 | #include <gv11b/mm_gv11b.h> |
80 | #include <gv11b/mc_gv11b.h> | ||
81 | #include <gv11b/ce_gv11b.h> | 78 | #include <gv11b/ce_gv11b.h> |
82 | #include <gv11b/fifo_gv11b.h> | 79 | #include <gv11b/fifo_gv11b.h> |
83 | #include <gv11b/regops_gv11b.h> | 80 | #include <gv11b/regops_gv11b.h> |
@@ -553,7 +550,6 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
553 | .enable = NULL, | 550 | .enable = NULL, |
554 | .disable = NULL, | 551 | .disable = NULL, |
555 | .reset = NULL, | 552 | .reset = NULL, |
556 | .boot_0 = NULL, | ||
557 | .is_intr1_pending = NULL, | 553 | .is_intr1_pending = NULL, |
558 | .is_intr_hub_pending = NULL, | 554 | .is_intr_hub_pending = NULL, |
559 | .log_pending_intrs = NULL , | 555 | .log_pending_intrs = NULL , |