diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/driver_common.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl.h | 23 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/module.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/vgpu.c | 1 |
5 files changed, 26 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index b82e3784..b4e6a02c 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "module.h" | 29 | #include "module.h" |
30 | #include "os_linux.h" | 30 | #include "os_linux.h" |
31 | #include "sysfs.h" | 31 | #include "sysfs.h" |
32 | #include "ioctl.h" | ||
32 | 33 | ||
33 | #define EMC3D_DEFAULT_RATIO 750 | 34 | #define EMC3D_DEFAULT_RATIO 750 |
34 | 35 | ||
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl.h b/drivers/gpu/nvgpu/common/linux/ioctl.h new file mode 100644 index 00000000..7bf16711 --- /dev/null +++ b/drivers/gpu/nvgpu/common/linux/ioctl.h | |||
@@ -0,0 +1,23 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify it | ||
5 | * under the terms and conditions of the GNU General Public License, | ||
6 | * version 2, as published by the Free Software Foundation. | ||
7 | * | ||
8 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
9 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
10 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
11 | * more details. | ||
12 | */ | ||
13 | #ifndef __NVGPU_IOCTL_H__ | ||
14 | #define __NVGPU_IOCTL_H__ | ||
15 | |||
16 | struct device; | ||
17 | struct class; | ||
18 | |||
19 | int gk20a_user_init(struct device *dev, const char *interface_name, | ||
20 | struct class *class); | ||
21 | void gk20a_user_deinit(struct device *dev, struct class *class); | ||
22 | |||
23 | #endif | ||
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c index dcff089b..ac64041e 100644 --- a/drivers/gpu/nvgpu/common/linux/module.c +++ b/drivers/gpu/nvgpu/common/linux/module.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include "module.h" | 40 | #include "module.h" |
41 | #include "intr.h" | 41 | #include "intr.h" |
42 | #include "cde.h" | 42 | #include "cde.h" |
43 | #include "ioctl.h" | ||
43 | #ifdef CONFIG_TEGRA_19x_GPU | 44 | #ifdef CONFIG_TEGRA_19x_GPU |
44 | #include "nvgpu_gpuid_t19x.h" | 45 | #include "nvgpu_gpuid_t19x.h" |
45 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION | 46 | #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 51672b2f..131caa68 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1504,10 +1504,6 @@ int gk20a_wait_for_idle(struct gk20a *g); | |||
1504 | 1504 | ||
1505 | int gk20a_init_gpu_characteristics(struct gk20a *g); | 1505 | int gk20a_init_gpu_characteristics(struct gk20a *g); |
1506 | 1506 | ||
1507 | int gk20a_user_init(struct device *dev, const char *interface_name, | ||
1508 | struct class *class); | ||
1509 | void gk20a_user_deinit(struct device *dev, struct class *class); | ||
1510 | |||
1511 | static inline u32 ptimer_scalingfactor10x(u32 ptimer_src_freq) | 1507 | static inline u32 ptimer_scalingfactor10x(u32 ptimer_src_freq) |
1512 | { | 1508 | { |
1513 | return (u32)(((u64)(PTIMER_REF_FREQ_HZ * 10)) / ptimer_src_freq); | 1509 | return (u32)(((u64)(PTIMER_REF_FREQ_HZ * 10)) / ptimer_src_freq); |
diff --git a/drivers/gpu/nvgpu/vgpu/vgpu.c b/drivers/gpu/nvgpu/vgpu/vgpu.c index 5f672b11..c13d8ff0 100644 --- a/drivers/gpu/nvgpu/vgpu/vgpu.c +++ b/drivers/gpu/nvgpu/vgpu/vgpu.c | |||
@@ -46,6 +46,7 @@ | |||
46 | 46 | ||
47 | #include "common/linux/module.h" | 47 | #include "common/linux/module.h" |
48 | #include "common/linux/os_linux.h" | 48 | #include "common/linux/os_linux.h" |
49 | #include "common/linux/ioctl.h" | ||
49 | 50 | ||
50 | #ifdef CONFIG_TEGRA_19x_GPU | 51 | #ifdef CONFIG_TEGRA_19x_GPU |
51 | #include <vgpu/vgpu_t19x.h> | 52 | #include <vgpu/vgpu_t19x.h> |