diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/sim.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/sim.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/sim.c b/drivers/gpu/nvgpu/common/linux/sim.c index 5406035b..8e964f39 100644 --- a/drivers/gpu/nvgpu/common/linux/sim.c +++ b/drivers/gpu/nvgpu/common/linux/sim.c | |||
@@ -25,11 +25,11 @@ | |||
25 | #include <nvgpu/dma.h> | 25 | #include <nvgpu/dma.h> |
26 | #include <nvgpu/soc.h> | 26 | #include <nvgpu/soc.h> |
27 | #include <nvgpu/hw_sim.h> | 27 | #include <nvgpu/hw_sim.h> |
28 | #include <nvgpu/sim.h> | ||
28 | #include "gk20a/gk20a.h" | 29 | #include "gk20a/gk20a.h" |
29 | #include "platform_gk20a.h" | 30 | #include "platform_gk20a.h" |
30 | #include "os_linux.h" | 31 | #include "os_linux.h" |
31 | #include "module.h" | 32 | #include "module.h" |
32 | #include "sim.h" /* will be removed in next patch */ | ||
33 | 33 | ||
34 | void sim_writel(struct sim_nvgpu *sim, u32 r, u32 v) | 34 | void sim_writel(struct sim_nvgpu *sim, u32 r, u32 v) |
35 | { | 35 | { |
@@ -51,10 +51,9 @@ void nvgpu_remove_sim_support_linux(struct gk20a *g) | |||
51 | { | 51 | { |
52 | struct sim_nvgpu_linux *sim_linux; | 52 | struct sim_nvgpu_linux *sim_linux; |
53 | 53 | ||
54 | if (!g->sim) { | 54 | if (!g->sim) |
55 | nvgpu_warn(g, "sim not allocated or not in sim_mode"); | ||
56 | return; | 55 | return; |
57 | } | 56 | |
58 | sim_linux = container_of(g->sim, struct sim_nvgpu_linux, sim); | 57 | sim_linux = container_of(g->sim, struct sim_nvgpu_linux, sim); |
59 | if (sim_linux->regs) { | 58 | if (sim_linux->regs) { |
60 | sim_writel(g->sim, sim_config_r(), sim_config_mode_disabled_v()); | 59 | sim_writel(g->sim, sim_config_r(), sim_config_mode_disabled_v()); |