diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/driver_common.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index b3333e37..9029366f 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c | |||
@@ -14,6 +14,7 @@ | |||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/reboot.h> | ||
17 | #include <linux/dma-mapping.h> | 18 | #include <linux/dma-mapping.h> |
18 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
19 | #include <uapi/linux/nvgpu.h> | 20 | #include <uapi/linux/nvgpu.h> |
@@ -37,6 +38,11 @@ | |||
37 | 38 | ||
38 | #define EMC3D_DEFAULT_RATIO 750 | 39 | #define EMC3D_DEFAULT_RATIO 750 |
39 | 40 | ||
41 | void nvgpu_kernel_restart(void *cmd) | ||
42 | { | ||
43 | kernel_restart(cmd); | ||
44 | } | ||
45 | |||
40 | static void nvgpu_init_vars(struct gk20a *g) | 46 | static void nvgpu_init_vars(struct gk20a *g) |
41 | { | 47 | { |
42 | struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); | 48 | struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g); |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index 868792c0..6aae851e 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -22,8 +22,6 @@ | |||
22 | * DEALINGS IN THE SOFTWARE. | 22 | * DEALINGS IN THE SOFTWARE. |
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include <linux/reboot.h> | ||
26 | |||
27 | #include <nvgpu/nvgpu_common.h> | 25 | #include <nvgpu/nvgpu_common.h> |
28 | #include <nvgpu/kmem.h> | 26 | #include <nvgpu/kmem.h> |
29 | #include <nvgpu/allocator.h> | 27 | #include <nvgpu/allocator.h> |
@@ -61,7 +59,7 @@ void __nvgpu_check_gpu_state(struct gk20a *g) | |||
61 | if (boot_0 == 0xffffffff) { | 59 | if (boot_0 == 0xffffffff) { |
62 | nvgpu_err(g, "GPU has disappeared from bus!!"); | 60 | nvgpu_err(g, "GPU has disappeared from bus!!"); |
63 | nvgpu_err(g, "Rebooting system!!"); | 61 | nvgpu_err(g, "Rebooting system!!"); |
64 | kernel_restart(NULL); | 62 | nvgpu_kernel_restart(NULL); |
65 | } | 63 | } |
66 | } | 64 | } |
67 | 65 | ||
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h index 50e8c8f1..34660516 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvgpu_common.h | |||
@@ -31,4 +31,6 @@ int nvgpu_probe(struct gk20a *g, | |||
31 | const char *interface_name, | 31 | const char *interface_name, |
32 | struct class *class); | 32 | struct class *class); |
33 | 33 | ||
34 | void nvgpu_kernel_restart(void *cmd); | ||
35 | |||
34 | #endif | 36 | #endif |