diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2017-04-14 16:19:04 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-05-18 18:14:31 -0400 |
commit | b7fca01b0e01544c3a66d2e05a8b99bcb621a004 (patch) | |
tree | d83d23a5f2ed2ad0ea30caa2b489b4bd0039b790 /drivers/gpu/nvgpu/common/linux | |
parent | b1d303685b384d58064d8b18ec97e1302bcbba88 (diff) |
gpu: nvgpu: Scrub gk20a_platform dependencies
Remove gk20a_platform dependencies from gk20a.h. This makes
gk20a_platform a Linux platform specific data structure. Add #include
for platform_gk20a.h in the source files that still depend on Linux.
JIRA NVGPU-16
Change-Id: Ib098accd34a1f5066eb8680c387f9b178169f3f0
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1463547
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/dma.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/driver_common.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/firmware.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_as.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/module.c | 1 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/timers.c | 1 |
9 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c index d3d51f18..53f3a35e 100644 --- a/drivers/gpu/nvgpu/common/linux/dma.c +++ b/drivers/gpu/nvgpu/common/linux/dma.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <nvgpu/linux/dma.h> | 25 | #include <nvgpu/linux/dma.h> |
26 | 26 | ||
27 | #include "gk20a/gk20a.h" | 27 | #include "gk20a/gk20a.h" |
28 | #include "gk20a/platform_gk20a.h" | ||
28 | 29 | ||
29 | #if defined(CONFIG_GK20A_VIDMEM) | 30 | #if defined(CONFIG_GK20A_VIDMEM) |
30 | static u64 __nvgpu_dma_alloc(struct nvgpu_allocator *allocator, dma_addr_t at, | 31 | static u64 __nvgpu_dma_alloc(struct nvgpu_allocator *allocator, dma_addr_t at, |
diff --git a/drivers/gpu/nvgpu/common/linux/driver_common.c b/drivers/gpu/nvgpu/common/linux/driver_common.c index 8855ce1f..0d29223f 100644 --- a/drivers/gpu/nvgpu/common/linux/driver_common.c +++ b/drivers/gpu/nvgpu/common/linux/driver_common.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #include "gk20a/gk20a_scale.h" | 24 | #include "gk20a/gk20a_scale.h" |
25 | #include "gk20a/gk20a.h" | 25 | #include "gk20a/gk20a.h" |
26 | #include "gk20a/platform_gk20a.h" | ||
26 | #include "module.h" | 27 | #include "module.h" |
27 | 28 | ||
28 | #define EMC3D_DEFAULT_RATIO 750 | 29 | #define EMC3D_DEFAULT_RATIO 750 |
diff --git a/drivers/gpu/nvgpu/common/linux/firmware.c b/drivers/gpu/nvgpu/common/linux/firmware.c index 43728f05..bc4e876a 100644 --- a/drivers/gpu/nvgpu/common/linux/firmware.c +++ b/drivers/gpu/nvgpu/common/linux/firmware.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <nvgpu/firmware.h> | 21 | #include <nvgpu/firmware.h> |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/platform_gk20a.h" | ||
24 | 25 | ||
25 | static const struct firmware *do_request_firmware(struct device *dev, | 26 | static const struct firmware *do_request_firmware(struct device *dev, |
26 | const char *prefix, const char *fw_name, int flags) | 27 | const char *prefix, const char *fw_name, int flags) |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl.c b/drivers/gpu/nvgpu/common/linux/ioctl.c index 0e88e91e..5a2753a5 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <nvgpu/nvgpu_common.h> | 21 | #include <nvgpu/nvgpu_common.h> |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/platform_gk20a.h" | ||
24 | #include "gk20a/dbg_gpu_gk20a.h" | 25 | #include "gk20a/dbg_gpu_gk20a.h" |
25 | #include "gk20a/ctxsw_trace_gk20a.h" | 26 | #include "gk20a/ctxsw_trace_gk20a.h" |
26 | #include "ioctl_channel.h" | 27 | #include "ioctl_channel.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_as.c b/drivers/gpu/nvgpu/common/linux/ioctl_as.c index 31d99d26..4bbcedda 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_as.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_as.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/gmmu.h> | 26 | #include <nvgpu/gmmu.h> |
27 | 27 | ||
28 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
29 | #include "gk20a/platform_gk20a.h" | ||
29 | #include "ioctl_as.h" | 30 | #include "ioctl_as.h" |
30 | 31 | ||
31 | static int gk20a_as_ioctl_bind_channel( | 32 | static int gk20a_as_ioctl_bind_channel( |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c index 17090291..8d95dd35 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "ioctl_ctrl.h" | 28 | #include "ioctl_ctrl.h" |
29 | #include "ioctl_tsg.h" | 29 | #include "ioctl_tsg.h" |
30 | #include "gk20a/gk20a.h" | 30 | #include "gk20a/gk20a.h" |
31 | #include "gk20a/platform_gk20a.h" | ||
31 | #include "gk20a/fence_gk20a.h" | 32 | #include "gk20a/fence_gk20a.h" |
32 | 33 | ||
33 | #include <nvgpu/log.h> | 34 | #include <nvgpu/log.h> |
diff --git a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c index e74ae2d7..e67965e1 100644 --- a/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c +++ b/drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <nvgpu/log.h> | 26 | #include <nvgpu/log.h> |
27 | 27 | ||
28 | #include "gk20a/gk20a.h" | 28 | #include "gk20a/gk20a.h" |
29 | #include "gk20a/platform_gk20a.h" | ||
29 | #include "gk20a/tsg_gk20a.h" | 30 | #include "gk20a/tsg_gk20a.h" |
30 | #include "ioctl_tsg.h" | 31 | #include "ioctl_tsg.h" |
31 | #include "ioctl_channel.h" | 32 | #include "ioctl_channel.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/module.c b/drivers/gpu/nvgpu/common/linux/module.c index c73b4940..ab99bef0 100644 --- a/drivers/gpu/nvgpu/common/linux/module.c +++ b/drivers/gpu/nvgpu/common/linux/module.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <nvgpu/soc.h> | 30 | #include <nvgpu/soc.h> |
31 | 31 | ||
32 | #include "gk20a/gk20a.h" | 32 | #include "gk20a/gk20a.h" |
33 | #include "gk20a/platform_gk20a.h" | ||
33 | #include "vgpu/vgpu.h" | 34 | #include "vgpu/vgpu.h" |
34 | #include "gk20a/gk20a_scale.h" | 35 | #include "gk20a/gk20a_scale.h" |
35 | #include "gk20a/ctxsw_trace_gk20a.h" | 36 | #include "gk20a/ctxsw_trace_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/common/linux/timers.c b/drivers/gpu/nvgpu/common/linux/timers.c index 9fe84b50..efd04557 100644 --- a/drivers/gpu/nvgpu/common/linux/timers.c +++ b/drivers/gpu/nvgpu/common/linux/timers.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <nvgpu/soc.h> | 21 | #include <nvgpu/soc.h> |
22 | 22 | ||
23 | #include "gk20a/gk20a.h" | 23 | #include "gk20a/gk20a.h" |
24 | #include "gk20a/platform_gk20a.h" | ||
24 | 25 | ||
25 | /* | 26 | /* |
26 | * Returns 1 if the platform is pre-Si and should ignore the timeout checking. | 27 | * Returns 1 if the platform is pre-Si and should ignore the timeout checking. |