From b7fca01b0e01544c3a66d2e05a8b99bcb621a004 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Fri, 14 Apr 2017 13:19:04 -0700 Subject: 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 Reviewed-on: http://git-master/r/1463547 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/dma.c | 1 + drivers/gpu/nvgpu/common/linux/driver_common.c | 1 + drivers/gpu/nvgpu/common/linux/firmware.c | 1 + drivers/gpu/nvgpu/common/linux/ioctl.c | 1 + drivers/gpu/nvgpu/common/linux/ioctl_as.c | 1 + drivers/gpu/nvgpu/common/linux/ioctl_ctrl.c | 1 + drivers/gpu/nvgpu/common/linux/ioctl_tsg.c | 1 + drivers/gpu/nvgpu/common/linux/module.c | 1 + drivers/gpu/nvgpu/common/linux/timers.c | 1 + drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c | 2 ++ 10 files changed, 11 insertions(+) (limited to 'drivers/gpu/nvgpu/common') 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 @@ #include #include "gk20a/gk20a.h" +#include "gk20a/platform_gk20a.h" #if defined(CONFIG_GK20A_VIDMEM) 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 @@ #include "gk20a/gk20a_scale.h" #include "gk20a/gk20a.h" +#include "gk20a/platform_gk20a.h" #include "module.h" #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 @@ #include #include "gk20a/gk20a.h" +#include "gk20a/platform_gk20a.h" static const struct firmware *do_request_firmware(struct device *dev, 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 @@ #include #include "gk20a/gk20a.h" +#include "gk20a/platform_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/ctxsw_trace_gk20a.h" #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 @@ #include #include "gk20a/gk20a.h" +#include "gk20a/platform_gk20a.h" #include "ioctl_as.h" 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 @@ #include "ioctl_ctrl.h" #include "ioctl_tsg.h" #include "gk20a/gk20a.h" +#include "gk20a/platform_gk20a.h" #include "gk20a/fence_gk20a.h" #include 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 @@ #include #include "gk20a/gk20a.h" +#include "gk20a/platform_gk20a.h" #include "gk20a/tsg_gk20a.h" #include "ioctl_tsg.h" #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 @@ #include #include "gk20a/gk20a.h" +#include "gk20a/platform_gk20a.h" #include "vgpu/vgpu.h" #include "gk20a/gk20a_scale.h" #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 @@ #include #include "gk20a/gk20a.h" +#include "gk20a/platform_gk20a.h" /* * Returns 1 if the platform is pre-Si and should ignore the timeout checking. diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c index 115a0904..a3c4e3b6 100644 --- a/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c +++ b/drivers/gpu/nvgpu/common/mm/nvgpu_allocator.c @@ -20,7 +20,9 @@ #include "gk20a/gk20a.h" #include "gk20a/mm_gk20a.h" +#ifdef CONFIG_DEBUG_FS #include "gk20a/platform_gk20a.h" +#endif u32 nvgpu_alloc_tracing_on; -- cgit v1.2.2