diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-06-20 15:18:47 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-06-21 20:34:49 -0400 |
commit | 92c43deefca150854193c6720717d56b61989c23 (patch) | |
tree | 2dbfdcdb3a0809b80d4fc50e1d882326e54c7d17 /drivers/gpu/nvgpu/gk20a/gk20a.h | |
parent | 2ffbdc50d884215ba043e8afd3c3bcbefd1e66f8 (diff) |
gpu: nvgpu: Remove Linux devnode fields from gk20a
Move Linux devnode related fields to a new header file os_linux.h.
The class structure is defined in module.c, so move its declaration
to module.h.
JIRA NVGPU-38
Change-Id: I5d8920169064f4289ff61004f7f81543a9aba221
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1505927
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index 5acc1074..cda70249 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -37,7 +37,6 @@ struct nvgpu_cpu_time_correlation_sample; | |||
37 | 37 | ||
38 | #include <nvgpu/lock.h> | 38 | #include <nvgpu/lock.h> |
39 | #include <nvgpu/thread.h> | 39 | #include <nvgpu/thread.h> |
40 | #include <linux/cdev.h> | ||
41 | #ifdef CONFIG_DEBUG_FS | 40 | #ifdef CONFIG_DEBUG_FS |
42 | #include <linux/debugfs.h> | 41 | #include <linux/debugfs.h> |
43 | #endif | 42 | #endif |
@@ -1157,53 +1156,11 @@ struct gk20a { | |||
1157 | 1156 | ||
1158 | struct nvgpu_gpu_characteristics gpu_characteristics; | 1157 | struct nvgpu_gpu_characteristics gpu_characteristics; |
1159 | 1158 | ||
1160 | struct { | ||
1161 | struct cdev cdev; | ||
1162 | struct device *node; | ||
1163 | } channel; | ||
1164 | |||
1165 | struct gk20a_as as; | 1159 | struct gk20a_as as; |
1166 | 1160 | ||
1167 | struct { | ||
1168 | struct cdev cdev; | ||
1169 | struct device *node; | ||
1170 | } ctrl; | ||
1171 | |||
1172 | struct { | ||
1173 | struct cdev cdev; | ||
1174 | struct device *node; | ||
1175 | } as_dev; | ||
1176 | |||
1177 | struct { | ||
1178 | struct cdev cdev; | ||
1179 | struct device *node; | ||
1180 | } dbg; | ||
1181 | |||
1182 | struct { | ||
1183 | struct cdev cdev; | ||
1184 | struct device *node; | ||
1185 | } prof; | ||
1186 | |||
1187 | struct { | ||
1188 | struct cdev cdev; | ||
1189 | struct device *node; | ||
1190 | } tsg; | ||
1191 | |||
1192 | struct { | ||
1193 | struct cdev cdev; | ||
1194 | struct device *node; | ||
1195 | } ctxsw; | ||
1196 | |||
1197 | struct { | ||
1198 | struct cdev cdev; | ||
1199 | struct device *node; | ||
1200 | } sched; | ||
1201 | |||
1202 | struct nvgpu_mutex client_lock; | 1161 | struct nvgpu_mutex client_lock; |
1203 | int client_refcount; /* open channels and ctrl nodes */ | 1162 | int client_refcount; /* open channels and ctrl nodes */ |
1204 | 1163 | ||
1205 | dev_t cdev_region; | ||
1206 | |||
1207 | struct gpu_ops ops; | 1164 | struct gpu_ops ops; |
1208 | 1165 | ||
1209 | int irqs_enabled; | 1166 | int irqs_enabled; |
@@ -1518,10 +1475,6 @@ static inline u32 scale_ptimer(u32 timeout , u32 scale10x) | |||
1518 | return (timeout * 10) / scale10x; | 1475 | return (timeout * 10) / scale10x; |
1519 | } | 1476 | } |
1520 | 1477 | ||
1521 | extern struct class nvgpu_class; | ||
1522 | |||
1523 | #define INTERFACE_NAME "nvhost%s-gpu" | ||
1524 | |||
1525 | int gk20a_prepare_poweroff(struct gk20a *g); | 1478 | int gk20a_prepare_poweroff(struct gk20a *g); |
1526 | int gk20a_finalize_poweron(struct gk20a *g); | 1479 | int gk20a_finalize_poweron(struct gk20a *g); |
1527 | 1480 | ||