diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 1c34c152..df16af85 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <nvgpu/soc.h> | 37 | #include <nvgpu/soc.h> |
38 | #include <nvgpu/clk_arb.h> | 38 | #include <nvgpu/clk_arb.h> |
39 | #include <nvgpu/therm.h> | 39 | #include <nvgpu/therm.h> |
40 | #include <nvgpu/mc.h> | ||
40 | 41 | ||
41 | #include <trace/events/gk20a.h> | 42 | #include <trace/events/gk20a.h> |
42 | 43 | ||
@@ -44,7 +45,6 @@ | |||
44 | #include "channel_sync_gk20a.h" | 45 | #include "channel_sync_gk20a.h" |
45 | 46 | ||
46 | #include "dbg_gpu_gk20a.h" | 47 | #include "dbg_gpu_gk20a.h" |
47 | #include "mc_gk20a.h" | ||
48 | #include "hal.h" | 48 | #include "hal.h" |
49 | #include "pstate/pstate.h" | 49 | #include "pstate/pstate.h" |
50 | 50 | ||
@@ -52,12 +52,7 @@ void __nvgpu_check_gpu_state(struct gk20a *g) | |||
52 | { | 52 | { |
53 | u32 boot_0 = 0xffffffff; | 53 | u32 boot_0 = 0xffffffff; |
54 | 54 | ||
55 | if (!g->ops.mc.boot_0) { | 55 | boot_0 = nvgpu_mc_boot_0(g, NULL, NULL, NULL); |
56 | nvgpu_err(g, "Can't determine GPU state, mc.boot_0 unset"); | ||
57 | return; | ||
58 | } | ||
59 | |||
60 | boot_0 = g->ops.mc.boot_0(g, NULL, NULL, NULL); | ||
61 | if (boot_0 == 0xffffffff) { | 56 | if (boot_0 == 0xffffffff) { |
62 | nvgpu_err(g, "GPU has disappeared from bus!!"); | 57 | nvgpu_err(g, "GPU has disappeared from bus!!"); |
63 | nvgpu_err(g, "Rebooting system!!"); | 58 | nvgpu_err(g, "Rebooting system!!"); |
@@ -78,7 +73,7 @@ int gk20a_detect_chip(struct gk20a *g) | |||
78 | return 0; | 73 | return 0; |
79 | } | 74 | } |
80 | 75 | ||
81 | gk20a_mc_boot_0(g, &p->gpu_arch, &p->gpu_impl, &p->gpu_rev); | 76 | nvgpu_mc_boot_0(g, &p->gpu_arch, &p->gpu_impl, &p->gpu_rev); |
82 | 77 | ||
83 | if ((p->gpu_arch + p->gpu_impl) == NVGPU_GPUID_GV11B) { | 78 | if ((p->gpu_arch + p->gpu_impl) == NVGPU_GPUID_GV11B) { |
84 | 79 | ||