diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-01-12 21:18:49 -0500 |
---|---|---|
committer | Varun Colbert <vcolbert@nvidia.com> | 2017-02-13 21:14:34 -0500 |
commit | b9194a1c3300e505d22fba97136dd305300397f0 (patch) | |
tree | c9c5366fb8dbca742200e2c8f85650ef8cc46859 /drivers/gpu/nvgpu/gk20a | |
parent | ed35f0a4042074463bf52ba04583fde680d1d389 (diff) |
gpu: nvgpu: Organize nvgpu_common.[ch]
Move nvgpu_common.c to drivers/gpu/nvgpu/common since it is a common
C file to all drivers.
Similarly move nvgpu_common.h to drivers/gpu/nvgpu/include/nvgpu since
this follows the new include guidelines.
Bug 1799159
Change-Id: I00ebed289973b27704c2cff073526e36505bf699
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1284612
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
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/gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c | 5 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/gr_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index 384fbdef..b4a1f6f4 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <trace/events/gk20a.h> | 25 | #include <trace/events/gk20a.h> |
26 | 26 | ||
27 | #include <nvgpu/timers.h> | 27 | #include <nvgpu/timers.h> |
28 | #include <nvgpu/nvgpu_common.h> | ||
28 | 29 | ||
29 | #include "gk20a.h" | 30 | #include "gk20a.h" |
30 | #include "channel_gk20a.h" | 31 | #include "channel_gk20a.h" |
@@ -34,7 +35,6 @@ | |||
34 | #include "gr_gk20a.h" | 35 | #include "gr_gk20a.h" |
35 | #include "debug_gk20a.h" | 36 | #include "debug_gk20a.h" |
36 | #include "semaphore_gk20a.h" | 37 | #include "semaphore_gk20a.h" |
37 | #include "nvgpu_common.h" | ||
38 | 38 | ||
39 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | 39 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
40 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> | 40 | #include <nvgpu/hw/gk20a/hw_pbdma_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c index f3ccd613..ee6586ae 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gk20a.c | |||
@@ -42,11 +42,11 @@ | |||
42 | #include <linux/sched.h> | 42 | #include <linux/sched.h> |
43 | #include <linux/version.h> | 43 | #include <linux/version.h> |
44 | 44 | ||
45 | #include <nvgpu/nvgpu_common.h> | ||
45 | #include <nvgpu/allocator.h> | 46 | #include <nvgpu/allocator.h> |
46 | #include <nvgpu/timers.h> | 47 | #include <nvgpu/timers.h> |
47 | 48 | ||
48 | #include "gk20a.h" | 49 | #include "gk20a.h" |
49 | #include "nvgpu_common.h" | ||
50 | #include "debug_gk20a.h" | 50 | #include "debug_gk20a.h" |
51 | #include "ctrl_gk20a.h" | 51 | #include "ctrl_gk20a.h" |
52 | #include "channel_sync_gk20a.h" | 52 | #include "channel_sync_gk20a.h" |
diff --git a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c index e651ad2e..7342cb1d 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_ctx_gk20a.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * GK20A Graphics Context | 4 | * GK20A Graphics Context |
5 | * | 5 | * |
6 | * Copyright (c) 2011-2016, NVIDIA CORPORATION. All rights reserved. | 6 | * Copyright (c) 2011-2017, NVIDIA CORPORATION. All rights reserved. |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
9 | * under the terms and conditions of the GNU General Public License, | 9 | * under the terms and conditions of the GNU General Public License, |
@@ -21,9 +21,10 @@ | |||
21 | 21 | ||
22 | #include <linux/firmware.h> | 22 | #include <linux/firmware.h> |
23 | 23 | ||
24 | #include <nvgpu/nvgpu_common.h> | ||
25 | |||
24 | #include "gk20a.h" | 26 | #include "gk20a.h" |
25 | #include "gr_ctx_gk20a.h" | 27 | #include "gr_ctx_gk20a.h" |
26 | #include "nvgpu_common.h" | ||
27 | 28 | ||
28 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> | 29 | #include <nvgpu/hw/gk20a/hw_gr_gk20a.h> |
29 | 30 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c index 5802cb68..cddb3316 100644 --- a/drivers/gpu/nvgpu/gk20a/gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/gr_gk20a.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include <trace/events/gk20a.h> | 32 | #include <trace/events/gk20a.h> |
33 | 33 | ||
34 | #include <nvgpu/timers.h> | 34 | #include <nvgpu/timers.h> |
35 | #include <nvgpu/nvgpu_common.h> | ||
35 | 36 | ||
36 | #include "gk20a.h" | 37 | #include "gk20a.h" |
37 | #include "kind_gk20a.h" | 38 | #include "kind_gk20a.h" |
@@ -43,7 +44,6 @@ | |||
43 | #include "semaphore_gk20a.h" | 44 | #include "semaphore_gk20a.h" |
44 | #include "platform_gk20a.h" | 45 | #include "platform_gk20a.h" |
45 | #include "ctxsw_trace_gk20a.h" | 46 | #include "ctxsw_trace_gk20a.h" |
46 | #include "nvgpu_common.h" | ||
47 | 47 | ||
48 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> | 48 | #include <nvgpu/hw/gk20a/hw_ccsr_gk20a.h> |
49 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> | 49 | #include <nvgpu/hw/gk20a/hw_ctxsw_prog_gk20a.h> |
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 0a2d36fe..9924e48f 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | |||
@@ -24,12 +24,12 @@ | |||
24 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
25 | #include <linux/uaccess.h> | 25 | #include <linux/uaccess.h> |
26 | 26 | ||
27 | #include <nvgpu/nvgpu_common.h> | ||
27 | #include <nvgpu/timers.h> | 28 | #include <nvgpu/timers.h> |
28 | 29 | ||
29 | #include "gk20a.h" | 30 | #include "gk20a.h" |
30 | #include "gr_gk20a.h" | 31 | #include "gr_gk20a.h" |
31 | #include "semaphore_gk20a.h" | 32 | #include "semaphore_gk20a.h" |
32 | #include "nvgpu_common.h" | ||
33 | 33 | ||
34 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> | 34 | #include <nvgpu/hw/gk20a/hw_mc_gk20a.h> |
35 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> | 35 | #include <nvgpu/hw/gk20a/hw_pwr_gk20a.h> |