diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gk20a.h | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/platform_gk20a.h | 4 |
6 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index 0413ae6a..506207f2 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "cde_gk20a.h" | 37 | #include "cde_gk20a.h" |
38 | #include "fence_gk20a.h" | 38 | #include "fence_gk20a.h" |
39 | #include "gr_gk20a.h" | 39 | #include "gr_gk20a.h" |
40 | #include "platform_gk20a.h" | 40 | #include "common/linux/os_linux.h" |
41 | 41 | ||
42 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | 42 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
43 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | 43 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c index aca9df75..0b26f657 100644 --- a/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/fecs_trace_gk20a.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "gk20a.h" | 28 | #include "gk20a.h" |
29 | #include "gr_gk20a.h" | 29 | #include "gr_gk20a.h" |
30 | #include "platform_gk20a.h" | 30 | #include "platform_gk20a.h" |
31 | #include "common/linux/os_linux.h" | ||
31 | 32 | ||
32 | #include <nvgpu/log.h> | 33 | #include <nvgpu/log.h> |
33 | 34 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h index dd5f0d17..90d3338a 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a.h | |||
@@ -1019,7 +1019,6 @@ struct nvgpu_bios { | |||
1019 | }; | 1019 | }; |
1020 | 1020 | ||
1021 | struct gk20a { | 1021 | struct gk20a { |
1022 | struct device *dev; | ||
1023 | struct nvgpu_nvhost_dev *nvhost_dev; | 1022 | struct nvgpu_nvhost_dev *nvhost_dev; |
1024 | 1023 | ||
1025 | /* | 1024 | /* |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 4dfb6ee8..d853c4f0 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include "regops_gk20a.h" | 39 | #include "regops_gk20a.h" |
40 | #include "dbg_gpu_gk20a.h" | 40 | #include "dbg_gpu_gk20a.h" |
41 | #include "ctxsw_trace_gk20a.h" | 41 | #include "ctxsw_trace_gk20a.h" |
42 | #include "platform_gk20a.h" | 42 | #include "common/linux/os_linux.h" |
43 | 43 | ||
44 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | 44 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
45 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> | 45 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 759e6a2b..d984d1f9 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include "fence_gk20a.h" | 49 | #include "fence_gk20a.h" |
50 | #include "kind_gk20a.h" | 50 | #include "kind_gk20a.h" |
51 | #include "bus_gk20a.h" | 51 | #include "bus_gk20a.h" |
52 | #include "common/linux/os_linux.h" | ||
52 | 53 | ||
53 | #include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h> | 54 | #include <nvgpu/hw/gk20a/hw_gmmu_gk20a.h> |
54 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> | 55 | #include <nvgpu/hw/gk20a/hw_ram_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h index 81402ad0..17c3f9a4 100644 --- a/drivers/gpu/nvgpu/gk20a/platform_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a.h | |||
@@ -259,10 +259,6 @@ static inline struct gk20a *get_gk20a(struct device *dev) | |||
259 | { | 259 | { |
260 | return gk20a_get_platform(dev)->g; | 260 | return gk20a_get_platform(dev)->g; |
261 | } | 261 | } |
262 | static inline struct device *dev_from_gk20a(struct gk20a *g) | ||
263 | { | ||
264 | return g->dev; | ||
265 | } | ||
266 | static inline struct gk20a *gk20a_from_dev(struct device *dev) | 262 | static inline struct gk20a *gk20a_from_dev(struct device *dev) |
267 | { | 263 | { |
268 | if (!dev) | 264 | if (!dev) |